Remove many small, obsolete, old browser hacks

[mirror_novnc.git] / tests / assertions.js

diff --git a/tests/assertions.js b/tests/assertions.js
index 56459f2c5c8ab3b2158115424416a93e7472caf4..c33c81ec531ebdbad558252ee6a72c5caeb26b35 100644 (file)
--- a/tests/assertions.js
+++ b/tests/assertions.js
@@ -1,65 +1,61 @@
-// 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;
-        var ctx = obj._target.getContext('2d');
-        var 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
-        var data = new Uint8Array(data_cl);
-        var same = true;
-        var len = data_cl.length;
-        if (len != target_data.length) {
-            same = false;
-        } else {
-            for (var i = 0; i < len; i++) {
-                if (data[i] != target_data[i]) {
-                    same = false;
-                    break;
-                }
+    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 = 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 (!cmp(data[i], targetData[i])) {
+                same = false;
+                break;
             }
         }
         if (!same) {
-            console.log("expected data: %o, actual data: %o", target_data, data);
+            // eslint-disable-next-line no-console
+            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) {
-        var obj = this._obj;
-        obj.inspect = function () {
-            var 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) };
+    _chai.Assertion.addMethod('sent', function (targetData) {
+        const obj = this._obj;
+        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) };
             res.prototype = obj;
             return res;
         };
-        var data = obj._websocket._get_sent_data();
-        var same = true;
-        if (data.length != target_data.length) {
+        const data = obj._websocket._getSentData();
+        let same = true;
+        if (data.length != targetData.length) {
             same = false;
         } else {
-            for (var i = 0; i < data.length; i++) {
-                if (data[i] != target_data[i]) {
+            for (let i = 0; i < data.length; i++) {
+                if (data[i] != targetData[i]) {
                     same = false;
                     break;
                 }
             }
         }
         if (!same) {
-            console.log("expected data: %o, actual data: %o", target_data, data);
+            // eslint-disable-next-line no-console
+            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 () {
@@ -69,13 +65,12 @@ chai.use(function (_chai, utils) {
     _chai.Assertion.overwriteMethod('equal', function (_super) {
         return function assertArrayEqual(target) {
             if (utils.flag(this, 'array')) {
-                var obj = this._obj;
+                const obj = this._obj;
 
-                var i;
-                var same = true;
+                let same = true;
 
                 if (utils.flag(this, 'deep')) {
-                    for (i = 0; i < obj.length; i++) {
+                    for (let i = 0; i < obj.length; i++) {
                         if (!utils.eql(obj[i], target[i])) {
                             same = false;
                             break;
@@ -83,11 +78,11 @@ 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 (i = 0; i < obj.length; i++) {
+                    for (let i = 0; i < obj.length; i++) {
                         if (obj[i] != target[i]) {
                             same = false;
                             break;
@@ -95,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);