Setup chai extensions centrally

They have global effects so make that clear by doing the setup in a single place.
Nuvoton-Israel · Sep 28, 2017 · 13d9108 · 13d9108
1 parent 0aaf59c
commit 13d9108
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/tests/assertions.js b/tests/assertions.js
@@ -1,4 +1,8 @@
-// some useful assertions for noVNC
+// Assertions that make it easier to use sinon
+import sinonChai from '../node_modules/sinon-chai/lib/sinon-chai.js';
+chai.use(sinonChai);
+
+// noVNC specific assertions
 chai.use(function (_chai, utils) {
     _chai.Assertion.addMethod('displayed', function (target_data) {
         var obj = this._obj;

diff --git a/tests/karma-test-main.js b/tests/karma-test-main.js
@@ -1,5 +1,6 @@
 var TEST_REGEXP = /test\..*\.js/;
 var allTestFiles = [];
+var extraFiles = ['/base/tests/assertions.js'];
 
 Object.keys(window.__karma__.files).forEach(function (file) {
     if (TEST_REGEXP.test(file)) {
@@ -10,6 +11,6 @@ Object.keys(window.__karma__.files).forEach(function (file) {
 
 require.config({
     baseUrl: '/base',
-    deps: allTestFiles,
+    deps: allTestFiles.concat(extraFiles),
     callback: window.__karma__.start,
 });
diff --git a/tests/test.display.js b/tests/test.display.js
@@ -5,10 +5,7 @@ import Base64 from '../core/base64.js';
 import Display from '../core/display.js';
 import { _forceCursorURIs, browserSupportsCursorURIs } from '../core/util/browsers.js';
 
-import './assertions.js';
 import sinon from '../vendor/sinon.js';
-import sinonChai from '../node_modules/sinon-chai/lib/sinon-chai.js';
-chai.use(sinonChai);
 
 describe('Display/Canvas Helper', function () {
     var checked_data = [

diff --git a/tests/test.rfb.js b/tests/test.rfb.js
@@ -6,10 +6,7 @@ import RFB from '../core/rfb.js';
 import Websock from '../core/websock.js';
 
 import FakeWebSocket from './fake.websocket.js';
-import './assertions';
 import sinon from '../vendor/sinon.js';
-import sinonChai from '../node_modules/sinon-chai/lib/sinon-chai.js';
-chai.use(sinonChai);
 
 function make_rfb (extra_opts) {
     if (!extra_opts) {

diff --git a/tests/test.util.js b/tests/test.util.js
@@ -7,8 +7,6 @@ import * as Log from '../core/util/logging.js';
 import l10nGet, { l10n } from '../core/util/localization.js';
 
 import sinon from '../vendor/sinon.js';
-import sinonChai from '../node_modules/sinon-chai/lib/sinon-chai.js';
-chai.use(sinonChai);
 
 describe('Utils', function() {
     "use strict";

diff --git a/tests/test.websock.js b/tests/test.websock.js
@@ -5,10 +5,7 @@ var expect = chai.expect;
 import Websock from '../core/websock.js';
 import FakeWebSocket from './fake.websocket.js';
 
-import './assertions';
 import sinon from '../vendor/sinon.js';
-import sinonChai from '../node_modules/sinon-chai/lib/sinon-chai.js';
-chai.use(sinonChai);
 
 describe('Websock', function() {
     "use strict";