diff --git a/tests/javascript_newsletter_editor/loadHelpers.js b/tests/javascript_newsletter_editor/loadHelpers.js index baa8779705..4218fd5301 100644 --- a/tests/javascript_newsletter_editor/loadHelpers.js +++ b/tests/javascript_newsletter_editor/loadHelpers.js @@ -1,6 +1,6 @@ var fs = require('fs'); module.exports = { - loadFileToContainer: function (path, window, containerTagName, opts) { + loadFileToContainer: function loadFileToContainer(path, window, containerTagName, opts) { var contents = fs.readFileSync(path); var container = window.document.createElement(containerTagName); var options = opts || {}; @@ -14,10 +14,10 @@ module.exports = { } global.window.document.body.appendChild(container); }, - loadScript: function (scriptPath, window, options) { + loadScript: function loadScript(scriptPath, window, options) { this.loadFileToContainer(scriptPath, window, 'script', options); }, - loadTemplate: function (path, window, opts) { + loadTemplate: function loadTemplate(path, window, opts) { var w = window || global.window; var options = opts || {}; options.type = 'text/x-handlebars-template'; diff --git a/tests/javascript_newsletter_editor/mochaTestHelper.js b/tests/javascript_newsletter_editor/mochaTestHelper.js index 413a280efb..4fbcd14e97 100644 --- a/tests/javascript_newsletter_editor/mochaTestHelper.js +++ b/tests/javascript_newsletter_editor/mochaTestHelper.js @@ -30,6 +30,7 @@ if (!global.document || !global.window) { } const testHelpers = require('./loadHelpers.js'); global.testHelpers = testHelpers; + const jQuery = require('jquery'); global.$ = jQuery; global.jQuery = jQuery; @@ -46,7 +47,7 @@ global.Node = global.window.Node; global.HTMLAnchorElement = global.window.HTMLAnchorElement; // Stub out interact.js -global.interact = function () { +global.interact = () => { return { draggable: global.interact, restrict: global.interact, @@ -58,44 +59,40 @@ global.interact = function () { styleCursor: global.interact, }; }; -global.spectrum = function () { return this; }; +global.spectrum = function spectrum() { return this; }; jQuery.fn.spectrum = global.spectrum; // Add global stubs for convenience -global.stubChannel = function (EditorApplication, returnObject) { +global.stubChannel = (EditorApplication, returnObject) => { var App = EditorApplication; App.getChannel = sinon.stub().returns(_.defaults(returnObject || {}, { - request: function () { - }, - trigger: function () { - }, - on: function () { - }, - off: function () { - }, + request: () => {}, + trigger: () => {}, + on: () => {}, + off: () => {}, })); }; -global.stubConfig = function (EditorApplication, opts) { +global.stubConfig = (EditorApplication, opts) => { var App = EditorApplication; App.getConfig = sinon.stub().returns(new global.Backbone.SuperModel(opts || {})); }; -global.stubAvailableStyles = function (EditorApplication, styles) { +global.stubAvailableStyles = (EditorApplication, styles) => { var App = EditorApplication; App.getAvailableStyles = sinon.stub().returns(new global.Backbone.SuperModel(styles || {})); }; -global.stubImage = function (defaultWidth, defaultHeight) { - global.Image = function () { - this.onload = function () {}; +global.stubImage = function stubImage(defaultWidth, defaultHeight) { + global.Image = function Image() { + this.onload = () => {}; this.naturalWidth = defaultWidth; this.naturalHeight = defaultHeight; this.address = ''; Object.defineProperty(this, 'src', { - get: function () { + get: function get() { return this.address; }, - set: function (src) { + set: function set(src) { this.address = src; this.onload(); }, @@ -118,7 +115,7 @@ global.window.matchMedia = window.matchMedia || ( } ); -global.window.fontsSelect = function () {}; +global.window.fontsSelect = () => {}; testHelpers.loadTemplate('blocks/base/toolsGeneric.hbs', window, { id: 'newsletter_editor_template_tools_generic' });