Avoid polluting global namespace

With modules, this is now considered bad form.

eslint.config.mjs

@@ -78,8 +78,6 @@ export default [
             globals: {
                 ...globals.node,
                 ...globals.mocha,
-                sinon: false,
-                expect: false,
             }
         },
         rules: {

tests/assertions.js

@@ -1,10 +1,6 @@
 import * as chai from '../node_modules/chai/chai.js';
-import sinon from '../node_modules/sinon/pkg/sinon-esm.js';
 import sinonChai from '../node_modules/sinon-chai/lib/sinon-chai.js';
 
-window.expect = chai.expect;
-
-window.sinon = sinon;
 chai.use(sinonChai);
 
 // noVNC specific assertions

tests/test.base64.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import Base64 from '../core/base64.js';
 
 describe('Base64 Tools', function () {

tests/test.browser.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import { isMac, isWindows, isIOS, isAndroid, isChromeOS,
          isSafari, isFirefox, isChrome, isChromium, isOpera, isEdge,
          isGecko, isWebKit, isBlink } from '../core/util/browser.js';

tests/test.copyrect.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import Websock from '../core/websock.js';
 import Display from '../core/display.js';
 

tests/test.deflator.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import { inflateInit, inflate } from "../vendor/pako/lib/zlib/inflate.js";
 import ZStream from "../vendor/pako/lib/zlib/zstream.js";
 import Deflator from "../core/deflator.js";

tests/test.display.js

@@ -1,3 +1,6 @@
+import { expect } from '../node_modules/chai/chai.js';
+import sinon from '../node_modules/sinon/pkg/sinon-esm.js';
+
 import Base64 from '../core/base64.js';
 import Display from '../core/display.js';
 

tests/test.gesturehandler.js

@@ -1,3 +1,6 @@
+import { expect } from '../node_modules/chai/chai.js';
+import sinon from '../node_modules/sinon/pkg/sinon-esm.js';
+
 import EventTargetMixin from '../core/util/eventtarget.js';
 
 import GestureHandler from '../core/input/gesturehandler.js';

tests/test.helper.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import keysyms from '../core/input/keysymdef.js';
 import * as KeyboardUtil from "../core/input/util.js";
 

tests/test.hextile.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import Websock from '../core/websock.js';
 import Display from '../core/display.js';
 

tests/test.inflator.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import { deflateInit, deflate, Z_FULL_FLUSH } from "../vendor/pako/lib/zlib/deflate.js";
 import ZStream from "../vendor/pako/lib/zlib/zstream.js";
 import Inflator from "../core/inflator.js";

tests/test.int.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import { toUnsigned32bit, toSigned32bit } from '../core/util/int.js';
 
 describe('Integer casting', function () {

tests/test.jpeg.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import Websock from '../core/websock.js';
 import Display from '../core/display.js';
 

tests/test.keyboard.js

@@ -1,3 +1,6 @@
+import { expect } from '../node_modules/chai/chai.js';
+import sinon from '../node_modules/sinon/pkg/sinon-esm.js';
+
 import Keyboard from '../core/input/keyboard.js';
 
 describe('Key Event Handling', function () {

tests/test.localization.js

@@ -1,3 +1,6 @@
+import { expect } from '../node_modules/chai/chai.js';
+import sinon from '../node_modules/sinon/pkg/sinon-esm.js';
+
 import _, { Localizer, l10n } from '../app/localization.js';
 
 describe('Localization', function () {

tests/test.raw.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import Websock from '../core/websock.js';
 import Display from '../core/display.js';
 

tests/test.rfb.js

@@ -1,3 +1,6 @@
+import { expect } from '../node_modules/chai/chai.js';
+import sinon from '../node_modules/sinon/pkg/sinon-esm.js';
+
 import RFB from '../core/rfb.js';
 import Websock from '../core/websock.js';
 import ZStream from "../vendor/pako/lib/zlib/zstream.js";

tests/test.rre.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import Websock from '../core/websock.js';
 import Display from '../core/display.js';
 

tests/test.tight.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import Websock from '../core/websock.js';
 import Display from '../core/display.js';
 

tests/test.tightpng.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import Websock from '../core/websock.js';
 import Display from '../core/display.js';
 

tests/test.util.js

@@ -1,4 +1,7 @@
 /* eslint-disable no-console */
+import { expect } from '../node_modules/chai/chai.js';
+import sinon from '../node_modules/sinon/pkg/sinon-esm.js';
+
 import * as Log from '../core/util/logging.js';
 import { encodeUTF8, decodeUTF8 } from '../core/util/strings.js';
 

tests/test.websock.js

@@ -1,3 +1,6 @@
+import { expect } from '../node_modules/chai/chai.js';
+import sinon from '../node_modules/sinon/pkg/sinon-esm.js';
+
 import Websock from '../core/websock.js';
 import FakeWebSocket from './fake.websocket.js';
 

tests/test.webutil.js

@@ -1,5 +1,8 @@
 /* jshint expr: true */
 
+import { expect } from '../node_modules/chai/chai.js';
+import sinon from '../node_modules/sinon/pkg/sinon-esm.js';
+
 import * as WebUtil from '../app/webutil.js';
 
 describe('WebUtil', function () {

tests/test.zrle.js

@@ -1,3 +1,5 @@
+import { expect } from '../node_modules/chai/chai.js';
+
 import Websock from '../core/websock.js';
 import Display from '../core/display.js';