summaryrefslogtreecommitdiff
path: root/karma.conf.js
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2018-07-13 13:12:04 +0200
committerPierre Ossman <ossman@cendio.se>2018-07-13 15:57:24 +0200
commitae2e1ff7bdecb5d3c8f3b136688a64d732709088 (patch)
treefcf1d4f8770bb2c07da6e73275c5d7e4172fbf89 /karma.conf.js
parent885363a373d32416776e683a7b631d7c77484149 (diff)
downloadnovnc-ae2e1ff7bdecb5d3c8f3b136688a64d732709088.tar.gz
Move sinon to karma framework
This frees us from manual imports, and makes things less magical as those aren't ES modules even if the code suggest that the are.
Diffstat (limited to 'karma.conf.js')
-rw-r--r--karma.conf.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/karma.conf.js b/karma.conf.js
index f0a1343..a455a9c 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -53,12 +53,10 @@ module.exports = (config) => {
// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
- frameworks: ['requirejs', 'mocha', 'chai'],
+ frameworks: ['requirejs', 'mocha', 'sinon-chai'],
// list of files / patterns to load in the browser (loaded in order)
files: [
- { pattern: 'vendor/sinon.js', included: false },
- { pattern: 'node_modules/sinon-chai/lib/sinon-chai.js', included: false },
{ pattern: 'app/localization.js', included: false },
{ pattern: 'app/webutil.js', included: false },
{ pattern: 'core/**/*.js', included: false },