diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index 69e6d610f5..e4fec05649 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -22,7 +22,6 @@ "semi": 0, "keyword-spacing": 0, "no-bitwise": 0, - "no-multi-assign": 0, "newline-per-chained-call": 0, "no-spaced-func": 0, "func-call-spacing": 0, diff --git a/tests/javascript/mochaTestHelper.js b/tests/javascript/mochaTestHelper.js index 07557171ea..faf916adff 100644 --- a/tests/javascript/mochaTestHelper.js +++ b/tests/javascript/mochaTestHelper.js @@ -28,7 +28,9 @@ if (!global.document || !global.window) { } global.testHelpers = require('./loadHelpers.js'); -global.$ = global.jQuery = global.window.jQuery = require('jquery'); +global.$ = require('jquery'); +global.jQuery = require('jquery'); +global.window.jQuery = require('jquery'); testHelpers.loadScript('tests/javascript/testBundles/vendor.js', global.window); global.Handlebars = global.window.Handlebars; @@ -46,8 +48,8 @@ global.interact = function () { styleCursor: global.interact }; }; - -jQuery.fn.spectrum = global.spectrum = function() { return this; }; +global.spectrum = function() { return this; }; +jQuery.fn.spectrum = global.spectrum; jQuery.fn.stick_in_parent = function() { return this; }; // Add global stubs for convenience