Remove many small, obsolete, old browser hacks

[mirror_novnc.git] / tests / assertions.js

diff --git a/tests/assertions.js b/tests/assertions.js
index a336a7a1bb3b61d6967ca6df9cfcb039f2d96900..c33c81ec531ebdbad558252ee6a72c5caeb26b35 100644 (file)
--- a/tests/assertions.js
+++ b/tests/assertions.js
@@ -1,50 +1,47 @@
-// 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) {
+    function _equal(a, b) {
+        return a === b;
+    }
+    _chai.Assertion.addMethod('displayed', function (targetData, cmp=_equal) {
         const obj = this._obj;
         const ctx = obj._target.getContext('2d');
-        const data_cl = ctx.getImageData(0, 0, obj._target.width, obj._target.height).data;
-        // NB(directxman12): PhantomJS 1.x doesn't implement Uint8ClampedArray, so work around that
-        const data = new Uint8Array(data_cl);
-        const len = data_cl.length;
-        new chai.Assertion(len).to.be.equal(target_data.length, "unexpected display size");
+        const data = ctx.getImageData(0, 0, obj._target.width, obj._target.height).data;
+        const len = data.length;
+        new chai.Assertion(len).to.be.equal(targetData.length, "unexpected display size");
         let same = true;
         for (let i = 0; i < len; i++) {
-            if (data[i] != target_data[i]) {
+            if (!cmp(data[i], targetData[i])) {
                 same = false;
                 break;
             }
         }
         if (!same) {
             // eslint-disable-next-line no-console
-            console.log("expected data: %o, actual data: %o", target_data, data);
+            console.log("expected data: %o, actual data: %o", targetData, data);
         }
         this.assert(same,
-            "expected #{this} to have displayed the image #{exp}, but instead it displayed #{act}",
-            "expected #{this} not to have displayed the image #{act}",
-            target_data,
-            data);
+                    "expected #{this} to have displayed the image #{exp}, but instead it displayed #{act}",
+                    "expected #{this} not to have displayed the image #{act}",
+                    targetData,
+                    data);
     });
 
-    _chai.Assertion.addMethod('sent', function (target_data) {
+    _chai.Assertion.addMethod('sent', function (targetData) {
         const obj = this._obj;
-        obj.inspect = function () {
+        obj.inspect = () => {
             const res = { _websocket: obj._websocket, rQi: obj._rQi, _rQ: new Uint8Array(obj._rQ.buffer, 0, obj._rQlen),
-                        _sQ: new Uint8Array(obj._sQ.buffer, 0, obj._sQlen) };
+                          _sQ: new Uint8Array(obj._sQ.buffer, 0, obj._sQlen) };
             res.prototype = obj;
             return res;
         };
-        const data = obj._websocket._get_sent_data();
+        const data = obj._websocket._getSentData();
         let same = true;
-        if (data.length != target_data.length) {
+        if (data.length != targetData.length) {
             same = false;
         } else {
             for (let i = 0; i < data.length; i++) {
-                if (data[i] != target_data[i]) {
+                if (data[i] != targetData[i]) {
                     same = false;
                     break;
                 }
@@ -52,13 +49,13 @@ chai.use(function (_chai, utils) {
         }
         if (!same) {
             // eslint-disable-next-line no-console
-            console.log("expected data: %o, actual data: %o", target_data, data);
+            console.log("expected data: %o, actual data: %o", targetData, data);
         }
         this.assert(same,
-            "expected #{this} to have sent the data #{exp}, but it actually sent #{act}",
-            "expected #{this} not to have sent the data #{act}",
-            Array.prototype.slice.call(target_data),
-            Array.prototype.slice.call(data));
+                    "expected #{this} to have sent the data #{exp}, but it actually sent #{act}",
+                    "expected #{this} not to have sent the data #{act}",
+                    Array.prototype.slice.call(targetData),
+                    Array.prototype.slice.call(data));
     });
 
     _chai.Assertion.addProperty('array', function () {
@@ -81,9 +78,9 @@ chai.use(function (_chai, utils) {
                     }
 
                     this.assert(same,
-                        "expected #{this} to have elements deeply equal to #{exp}",
-                        "expected #{this} not to have elements deeply equal to #{exp}",
-                        Array.prototype.slice.call(target));
+                                "expected #{this} to have elements deeply equal to #{exp}",
+                                "expected #{this} not to have elements deeply equal to #{exp}",
+                                Array.prototype.slice.call(target));
                 } else {
                     for (let i = 0; i < obj.length; i++) {
                         if (obj[i] != target[i]) {
@@ -93,9 +90,9 @@ chai.use(function (_chai, utils) {
                     }
 
                     this.assert(same,
-                        "expected #{this} to have elements equal to #{exp}",
-                        "expected #{this} not to have elements equal to #{exp}",
-                        Array.prototype.slice.call(target));
+                                "expected #{this} to have elements equal to #{exp}",
+                                "expected #{this} not to have elements equal to #{exp}",
+                                Array.prototype.slice.call(target));
                 }
             } else {
                 _super.apply(this, arguments);