From dde598eb64f471095bfa81d26acc197b43759249 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Wed, 27 Sep 2017 12:29:19 +0000 Subject: [PATCH 01/10] rebasing on master --- assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js b/assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js index b5f6d68821..404d27b43f 100644 --- a/assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js +++ b/assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js @@ -51,8 +51,7 @@ define([ .on('resizestart', function () { that.isBeingResized = true; that.$el.addClass('mailpoet_resize_active'); - }) - .on('resizemove', function (event) { + }).on('resizemove', function (event) { var onResize = that.options.onResize.bind(that); return onResize(event); }) From 87e6cc2a4f3a5a656c557af4a54c8fcbfe7df041 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Wed, 27 Sep 2017 15:35:18 +0000 Subject: [PATCH 02/10] Tests no-whitespace-before-property --- .eslintrc.tests.json | 1 - tests/javascript/newsletter_editor/blocks/header.spec.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index 5fc5b2c185..ff37f7b9d4 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -9,7 +9,6 @@ }, "rules": { "import/no-amd": 0, - "no-whitespace-before-property": 0, "global-require": 0, "keyword-spacing": 0, "no-bitwise": 0, diff --git a/tests/javascript/newsletter_editor/blocks/header.spec.js b/tests/javascript/newsletter_editor/blocks/header.spec.js index e69adf6ca6..9385f11fb7 100644 --- a/tests/javascript/newsletter_editor/blocks/header.spec.js +++ b/tests/javascript/newsletter_editor/blocks/header.spec.js @@ -12,7 +12,7 @@ define([ var model; beforeEach(function () { global.stubChannel(EditorApplication); - global. stubConfig(EditorApplication, { + global.stubConfig(EditorApplication, { blockDefaults: {} }); model = new (HeaderBlock.HeaderBlockModel)(); From abd4f6cac2d0d4cd5cf727510cc74a0bf5910125 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Wed, 27 Sep 2017 15:36:11 +0000 Subject: [PATCH 03/10] Tests no-spaced-func --- .eslintrc.tests.json | 1 - tests/javascript/newsletter_editor/blocks/divider.spec.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index ff37f7b9d4..64f66af2b0 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -12,7 +12,6 @@ "global-require": 0, "keyword-spacing": 0, "no-bitwise": 0, - "no-spaced-func": 0, "func-call-spacing": 0, "max-len": 0, "space-unary-ops": 0, diff --git a/tests/javascript/newsletter_editor/blocks/divider.spec.js b/tests/javascript/newsletter_editor/blocks/divider.spec.js index 32e184f1d4..022f705fea 100644 --- a/tests/javascript/newsletter_editor/blocks/divider.spec.js +++ b/tests/javascript/newsletter_editor/blocks/divider.spec.js @@ -200,7 +200,7 @@ define([ expect(model.get('styles.block.backgroundColor')).to.equal('#cccccc'); }); - it ('changes color of available divider styles when actual divider color changes', function() { + it('changes color of available divider styles when actual divider color changes', function() { var newColor = '#889912'; view.$('.mailpoet_field_divider_border_color').val(newColor).change(); expect(view.$('.mailpoet_field_divider_style div')).to.have.$css('border-top-color', newColor); From bda71ae78e9009a3bcf91672e49ee090de46d24b Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Wed, 27 Sep 2017 15:38:09 +0000 Subject: [PATCH 04/10] Tests space-unary-ops --- .eslintrc.tests.json | 1 - .../newsletter_editor/blocks/automatedLatestContent.spec.js | 2 +- tests/javascript/newsletter_editor/blocks/button.spec.js | 2 +- tests/javascript/newsletter_editor/blocks/container.spec.js | 2 +- tests/javascript/newsletter_editor/blocks/divider.spec.js | 2 +- tests/javascript/newsletter_editor/blocks/footer.spec.js | 2 +- tests/javascript/newsletter_editor/blocks/header.spec.js | 2 +- tests/javascript/newsletter_editor/blocks/image.spec.js | 2 +- tests/javascript/newsletter_editor/blocks/social.spec.js | 2 +- tests/javascript/newsletter_editor/blocks/spacer.spec.js | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index 64f66af2b0..a9621ac7be 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -14,7 +14,6 @@ "no-bitwise": 0, "func-call-spacing": 0, "max-len": 0, - "space-unary-ops": 0, "no-underscore-dangle": 0, "no-shadow": 0, "padded-blocks": 0, diff --git a/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js b/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js index 058f2edc7f..ca23d4a4b9 100644 --- a/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js +++ b/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js @@ -555,7 +555,7 @@ define([ global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click(); mock.verify(); - delete(global.MailPoet.Modal.cancel); + delete (global.MailPoet.Modal.cancel); }); }); }); diff --git a/tests/javascript/newsletter_editor/blocks/button.spec.js b/tests/javascript/newsletter_editor/blocks/button.spec.js index 1ab14a0cc7..8a7eb6085b 100644 --- a/tests/javascript/newsletter_editor/blocks/button.spec.js +++ b/tests/javascript/newsletter_editor/blocks/button.spec.js @@ -480,7 +480,7 @@ define([ global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click(); mock.verify(); - delete(global.MailPoet.Modal.cancel); + delete (global.MailPoet.Modal.cancel); }); }); }); diff --git a/tests/javascript/newsletter_editor/blocks/container.spec.js b/tests/javascript/newsletter_editor/blocks/container.spec.js index b774116390..213d042488 100644 --- a/tests/javascript/newsletter_editor/blocks/container.spec.js +++ b/tests/javascript/newsletter_editor/blocks/container.spec.js @@ -222,7 +222,7 @@ define([ global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click(); mock.verify(); - delete(global.MailPoet.Modal.cancel); + delete (global.MailPoet.Modal.cancel); }); }); }); diff --git a/tests/javascript/newsletter_editor/blocks/divider.spec.js b/tests/javascript/newsletter_editor/blocks/divider.spec.js index 022f705fea..30918c3d53 100644 --- a/tests/javascript/newsletter_editor/blocks/divider.spec.js +++ b/tests/javascript/newsletter_editor/blocks/divider.spec.js @@ -222,7 +222,7 @@ define([ global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click(); mock.verify(); - delete(global.MailPoet.Modal.cancel); + delete (global.MailPoet.Modal.cancel); }); }); }); diff --git a/tests/javascript/newsletter_editor/blocks/footer.spec.js b/tests/javascript/newsletter_editor/blocks/footer.spec.js index d981af3225..558a012448 100644 --- a/tests/javascript/newsletter_editor/blocks/footer.spec.js +++ b/tests/javascript/newsletter_editor/blocks/footer.spec.js @@ -203,7 +203,7 @@ define([ global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click(); mock.verify(); - delete(global.MailPoet.Modal.cancel); + delete (global.MailPoet.Modal.cancel); }); }); }); diff --git a/tests/javascript/newsletter_editor/blocks/header.spec.js b/tests/javascript/newsletter_editor/blocks/header.spec.js index 9385f11fb7..811aa83a47 100644 --- a/tests/javascript/newsletter_editor/blocks/header.spec.js +++ b/tests/javascript/newsletter_editor/blocks/header.spec.js @@ -203,7 +203,7 @@ define([ global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click(); mock.verify(); - delete(global.MailPoet.Modal.cancel); + delete (global.MailPoet.Modal.cancel); }); }); }); diff --git a/tests/javascript/newsletter_editor/blocks/image.spec.js b/tests/javascript/newsletter_editor/blocks/image.spec.js index 96c9a28966..a5f30afecf 100644 --- a/tests/javascript/newsletter_editor/blocks/image.spec.js +++ b/tests/javascript/newsletter_editor/blocks/image.spec.js @@ -223,7 +223,7 @@ define([ global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click(); mock.verify(); - delete(global.MailPoet.Modal.cancel); + delete (global.MailPoet.Modal.cancel); }); }); }); diff --git a/tests/javascript/newsletter_editor/blocks/social.spec.js b/tests/javascript/newsletter_editor/blocks/social.spec.js index 4e0aa82979..cacfb940d1 100644 --- a/tests/javascript/newsletter_editor/blocks/social.spec.js +++ b/tests/javascript/newsletter_editor/blocks/social.spec.js @@ -278,7 +278,7 @@ define([ global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click(); mock.verify(); - delete(global.MailPoet.Modal.cancel); + delete (global.MailPoet.Modal.cancel); }); }); }); diff --git a/tests/javascript/newsletter_editor/blocks/spacer.spec.js b/tests/javascript/newsletter_editor/blocks/spacer.spec.js index ef52ae6b4e..56db09f18b 100644 --- a/tests/javascript/newsletter_editor/blocks/spacer.spec.js +++ b/tests/javascript/newsletter_editor/blocks/spacer.spec.js @@ -157,7 +157,7 @@ define([ global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click(); mock.verify(); - delete(global.MailPoet.Modal.cancel); + delete (global.MailPoet.Modal.cancel); }); }); }); From bb8591a67b3cf4f423396ad13ba82810f643a7c4 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Wed, 27 Sep 2017 15:38:46 +0000 Subject: [PATCH 05/10] Tests space-before-blocks --- .eslintrc.tests.json | 1 - tests/javascript/newsletter_editor/components/styles.spec.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index a9621ac7be..b16620c8e1 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -17,7 +17,6 @@ "no-underscore-dangle": 0, "no-shadow": 0, "padded-blocks": 0, - "space-before-blocks": 0, "object-curly-spacing": 0, "func-names": 0, "space-before-function-paren": 0 diff --git a/tests/javascript/newsletter_editor/components/styles.spec.js b/tests/javascript/newsletter_editor/components/styles.spec.js index d34a6dcae0..8359edec09 100644 --- a/tests/javascript/newsletter_editor/components/styles.spec.js +++ b/tests/javascript/newsletter_editor/components/styles.spec.js @@ -24,7 +24,7 @@ define([ }); it('triggers autoSave when changed', function() { - var mock = sinon.mock({ trigger: function(){}}).expects('trigger').once().withExactArgs('autoSave'); + var mock = sinon.mock({ trigger: function() {}}).expects('trigger').once().withExactArgs('autoSave'); EditorApplication.getChannel = function() { return { trigger: mock From 68165b7b78e7a5f686d32565e29abcc6ee4b1221 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Wed, 27 Sep 2017 15:41:06 +0000 Subject: [PATCH 06/10] Tests space-before-function-paren --- .eslintrc.tests.json | 3 +- tests/javascript/mochaTestHelper.js | 14 ++-- .../blocks/automatedLatestContent.spec.js | 42 +++++----- .../newsletter_editor/blocks/button.spec.js | 10 +-- .../blocks/container.spec.js | 4 +- .../newsletter_editor/blocks/divider.spec.js | 8 +- .../newsletter_editor/blocks/footer.spec.js | 4 +- .../newsletter_editor/blocks/header.spec.js | 4 +- .../newsletter_editor/blocks/image.spec.js | 2 +- .../newsletter_editor/blocks/posts.spec.js | 24 +++--- .../newsletter_editor/blocks/social.spec.js | 8 +- .../newsletter_editor/blocks/spacer.spec.js | 4 +- .../newsletter_editor/blocks/text.spec.js | 2 +- .../components/communication.spec.js | 78 +++++++++---------- .../components/config.spec.js | 4 +- .../components/content.spec.js | 36 ++++----- .../components/heading.spec.js | 18 ++--- .../newsletter_editor/components/save.spec.js | 56 ++++++------- .../components/sidebar.spec.js | 64 +++++++-------- .../components/styles.spec.js | 20 ++--- 20 files changed, 202 insertions(+), 203 deletions(-) diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index b16620c8e1..f04493a627 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -18,7 +18,6 @@ "no-shadow": 0, "padded-blocks": 0, "object-curly-spacing": 0, - "func-names": 0, - "space-before-function-paren": 0 + "func-names": 0 } } diff --git a/tests/javascript/mochaTestHelper.js b/tests/javascript/mochaTestHelper.js index 5fb73dcc4a..1cbdfa66bf 100644 --- a/tests/javascript/mochaTestHelper.js +++ b/tests/javascript/mochaTestHelper.js @@ -52,9 +52,9 @@ global.interact = function () { styleCursor: global.interact }; }; -global.spectrum = function() { return this; }; +global.spectrum = function () { return this; }; jQuery.fn.spectrum = global.spectrum; -jQuery.fn.stick_in_parent = function() { return this; }; +jQuery.fn.stick_in_parent = function () { return this; }; // Add global stubs for convenience // TODO: Extract those to a separate file @@ -78,18 +78,18 @@ global.stubAvailableStyles = function (EditorApplication, styles) { App.getAvailableStyles = sinon.stub().returns(new global.Backbone.SuperModel(styles || {})); }; -global.stubImage = function(defaultWidth, defaultHeight) { - global.Image = function() { - this.onload = function() {}; +global.stubImage = function (defaultWidth, defaultHeight) { + global.Image = function () { + this.onload = function () {}; this.naturalWidth = defaultWidth; this.naturalHeight = defaultHeight; this.address = ''; Object.defineProperty(this, 'src', { - get: function() { + get: function () { return this.address; }, - set: function(src) { + set: function (src) { this.address = src; this.onload(); } diff --git a/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js b/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js index ca23d4a4b9..126a59dc05 100644 --- a/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js +++ b/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js @@ -9,7 +9,7 @@ define([ 'newsletter_editor/blocks/container', 'amd-inject-loader!newsletter_editor/blocks/automatedLatestContent', 'newsletter_editor/components/communication' -], function( +], function ( App, AutomatedLatestContentBlock, ContainerBlock, @@ -19,19 +19,19 @@ define([ var EditorApplication = App; var CommunicationComponent = Communication; - describe('Automated Latest Content Supervisor', function() { + describe('Automated Latest Content Supervisor', function () { var model; var mock; var module; - beforeEach(function() { + beforeEach(function () { model = new AutomatedLatestContentBlock.ALCSupervisor(); }); - it('fetches posts in bulk from the server', function() { + it('fetches posts in bulk from the server', function () { global.stubChannel(EditorApplication); EditorApplication.findModels = sinon.stub().returns([new Backbone.SuperModel()]); - mock = sinon.mock({ getBulkTransformedPosts: function() {} }) + mock = sinon.mock({ getBulkTransformedPosts: function () {} }) .expects('getBulkTransformedPosts').once().returns(jQuery.Deferred()); module = AutomatedLatestContentInjector({ @@ -46,7 +46,7 @@ define([ mock.verify(); }); - it('refreshes posts for given blocks', function() { + it('refreshes posts for given blocks', function () { var block1 = new Backbone.SuperModel(); var block2 = new Backbone.SuperModel(); var postsSet1 = [ @@ -74,7 +74,7 @@ define([ var model; var module; - before(function() { + before(function () { module = AutomatedLatestContentBlock; }); @@ -254,7 +254,7 @@ define([ expect(model.get('divider.styles.block.padding')).to.equal('38px'); }); - it('accepts displayable posts', function() { + it('accepts displayable posts', function () { var model; EditorApplication.getBlockTypeModel = sinon.stub().returns(ContainerBlock.ContainerBlockModel); model = new (module.AutomatedLatestContentBlockModel)(); @@ -273,7 +273,7 @@ define([ var view; var module; - before(function() { + before(function () { module = AutomatedLatestContentBlock; }); @@ -334,10 +334,10 @@ define([ var view; var module; - before(function() { + before(function () { module = AutomatedLatestContentInjector({ 'newsletter_editor/components/communication': { - getPostTypes: function() { + getPostTypes: function () { return jQuery.Deferred(); } } @@ -345,7 +345,7 @@ define([ }); before(function () { - CommunicationComponent.getPostTypes = function() { + CommunicationComponent.getPostTypes = function () { var deferred = jQuery.Deferred(); deferred.resolve([ { @@ -378,7 +378,7 @@ define([ EditorApplication.getBlockTypeView = sinon.stub().returns(Backbone.View); }); - beforeEach(function() { + beforeEach(function () { model = new (module.AutomatedLatestContentBlockModel)(); view = new (module.AutomatedLatestContentBlockSettingsView)({model: model}); }); @@ -392,7 +392,7 @@ define([ }); describe('once rendered', function () { - beforeEach(function() { + beforeEach(function () { model = new (module.AutomatedLatestContentBlockModel)(); view = new (module.AutomatedLatestContentBlockSettingsView)({model: model}); view.render(); @@ -500,10 +500,10 @@ define([ expect(model.get('showDivider')).to.equal(newValue); }); - describe('when "title only" display type is selected', function() { + describe('when "title only" display type is selected', function () { var model; var view; - beforeEach(function() { + beforeEach(function () { model = new (module.AutomatedLatestContentBlockModel)(); view = new (module.AutomatedLatestContentBlockSettingsView)({model: model}); view.render(); @@ -514,10 +514,10 @@ define([ expect(view.$('.mailpoet_automated_latest_content_title_as_list')).to.not.have.$class('mailpoet_hidden'); }); - describe('when "title as list" is selected', function() { + describe('when "title as list" is selected', function () { var model; var view; - beforeEach(function() { + beforeEach(function () { model = new (module.AutomatedLatestContentBlockModel)(); view = new (module.AutomatedLatestContentBlockSettingsView)({model: model}); view.render(); @@ -530,14 +530,14 @@ define([ expect(view.$('.mailpoet_automated_latest_content_title_as_link')).to.have.$class('mailpoet_hidden'); }); - it('is set to "yes"', function() { + it('is set to "yes"', function () { expect(model.get('titleIsLink')).to.equal(true); }); }); }); - describe('when "title as list" is deselected', function() { - before(function() { + describe('when "title as list" is deselected', function () { + before(function () { view.$('.mailpoet_automated_latest_content_title_format').val('ul').change(); view.$('.mailpoet_automated_latest_content_title_format').val('h3').change(); }); diff --git a/tests/javascript/newsletter_editor/blocks/button.spec.js b/tests/javascript/newsletter_editor/blocks/button.spec.js index 8a7eb6085b..1bd5183291 100644 --- a/tests/javascript/newsletter_editor/blocks/button.spec.js +++ b/tests/javascript/newsletter_editor/blocks/button.spec.js @@ -4,7 +4,7 @@ const sinon = global.sinon; define([ 'newsletter_editor/App', 'newsletter_editor/blocks/button' -], function(App, ButtonBlock) { +], function (App, ButtonBlock) { var EditorApplication = App; describe('Button', function () { @@ -322,7 +322,7 @@ define([ describe('once rendered', function () { var model; var view; - before(function() { + before(function () { global.stubChannel(EditorApplication); global.stubConfig(EditorApplication); global.stubAvailableStyles(EditorApplication, { @@ -331,7 +331,7 @@ define([ }); }); - beforeEach(function() { + beforeEach(function () { model = new (ButtonBlock.ButtonBlockModel)({ type: 'button', text: 'Some random text' @@ -453,7 +453,7 @@ define([ expect(view.$('.mailpoet_field_button_line_height_input').val()).to.equal('37'); }); - it('does not display link option when `hideLink` option is active', function() { + it('does not display link option when `hideLink` option is active', function () { view = new (ButtonBlock.ButtonBlockSettingsView)({ model: model, renderOptions: { @@ -464,7 +464,7 @@ define([ expect(view.$('.mailpoet_field_button_url').length).to.equal(0); }); - it('does not display "Apply to all" option when `hideApplyToAll` option is active', function() { + it('does not display "Apply to all" option when `hideApplyToAll` option is active', function () { view = new (ButtonBlock.ButtonBlockSettingsView)({ model: model, renderOptions: { diff --git a/tests/javascript/newsletter_editor/blocks/container.spec.js b/tests/javascript/newsletter_editor/blocks/container.spec.js index 213d042488..ae17892770 100644 --- a/tests/javascript/newsletter_editor/blocks/container.spec.js +++ b/tests/javascript/newsletter_editor/blocks/container.spec.js @@ -5,7 +5,7 @@ const Backbone = global.Backbone; define([ 'newsletter_editor/App', 'newsletter_editor/blocks/container' -], function(App, ContainerBlock) { +], function (App, ContainerBlock) { var EditorApplication = App; describe('Container', function () { @@ -205,7 +205,7 @@ define([ describe('once rendered', function () { var model; var view; - beforeEach(function() { + beforeEach(function () { global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication); model = new (ContainerBlock.ContainerBlockModel)(); diff --git a/tests/javascript/newsletter_editor/blocks/divider.spec.js b/tests/javascript/newsletter_editor/blocks/divider.spec.js index 30918c3d53..472af90cee 100644 --- a/tests/javascript/newsletter_editor/blocks/divider.spec.js +++ b/tests/javascript/newsletter_editor/blocks/divider.spec.js @@ -4,7 +4,7 @@ const sinon = global.sinon; define([ 'newsletter_editor/App', 'newsletter_editor/blocks/divider' -], function(App, DividerBlock) { +], function (App, DividerBlock) { var EditorApplication = App; describe('Divider', function () { @@ -157,7 +157,7 @@ define([ var model; var view; - before(function() { + before(function () { global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication, { dividers: ['solid', 'inset'] @@ -200,13 +200,13 @@ define([ expect(model.get('styles.block.backgroundColor')).to.equal('#cccccc'); }); - it('changes color of available divider styles when actual divider color changes', function() { + it('changes color of available divider styles when actual divider color changes', function () { var newColor = '#889912'; view.$('.mailpoet_field_divider_border_color').val(newColor).change(); expect(view.$('.mailpoet_field_divider_style div')).to.have.$css('border-top-color', newColor); }); - it('does not display "Apply to all" option when `hideApplyToAll` option is active', function() { + it('does not display "Apply to all" option when `hideApplyToAll` option is active', function () { view = new (DividerBlock.DividerBlockSettingsView)({ model: model, renderOptions: { diff --git a/tests/javascript/newsletter_editor/blocks/footer.spec.js b/tests/javascript/newsletter_editor/blocks/footer.spec.js index 558a012448..91a0d7a7a9 100644 --- a/tests/javascript/newsletter_editor/blocks/footer.spec.js +++ b/tests/javascript/newsletter_editor/blocks/footer.spec.js @@ -4,7 +4,7 @@ const sinon = global.sinon; define([ 'newsletter_editor/App', 'newsletter_editor/blocks/footer' -], function(App, FooterBlock) { +], function (App, FooterBlock) { var EditorApplication = App; describe('Footer', function () { @@ -155,7 +155,7 @@ define([ var model; var view; - beforeEach(function() { + beforeEach(function () { global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication, { fonts: ['Arial', 'Tahoma'], diff --git a/tests/javascript/newsletter_editor/blocks/header.spec.js b/tests/javascript/newsletter_editor/blocks/header.spec.js index 811aa83a47..02ff11e0f0 100644 --- a/tests/javascript/newsletter_editor/blocks/header.spec.js +++ b/tests/javascript/newsletter_editor/blocks/header.spec.js @@ -4,7 +4,7 @@ const sinon = global.sinon; define([ 'newsletter_editor/App', 'newsletter_editor/blocks/header' -], function(App, HeaderBlock) { +], function (App, HeaderBlock) { var EditorApplication = App; describe('Header', function () { @@ -155,7 +155,7 @@ define([ var model; var view; - beforeEach(function() { + beforeEach(function () { global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication, { fonts: ['Arial', 'Tahoma'], diff --git a/tests/javascript/newsletter_editor/blocks/image.spec.js b/tests/javascript/newsletter_editor/blocks/image.spec.js index a5f30afecf..932abb8196 100644 --- a/tests/javascript/newsletter_editor/blocks/image.spec.js +++ b/tests/javascript/newsletter_editor/blocks/image.spec.js @@ -4,7 +4,7 @@ const sinon = global.sinon; define([ 'newsletter_editor/App', 'newsletter_editor/blocks/image' -], function(App, ImageBlock) { +], function (App, ImageBlock) { var EditorApplication = App; describe('Image', function () { diff --git a/tests/javascript/newsletter_editor/blocks/posts.spec.js b/tests/javascript/newsletter_editor/blocks/posts.spec.js index 262f6b3714..fafb88c6b0 100644 --- a/tests/javascript/newsletter_editor/blocks/posts.spec.js +++ b/tests/javascript/newsletter_editor/blocks/posts.spec.js @@ -8,7 +8,7 @@ define([ 'newsletter_editor/components/communication', 'newsletter_editor/blocks/posts', 'newsletter_editor/blocks/container' -], function(App, Communication, PostsBlock, ContainerBlock) { +], function (App, Communication, PostsBlock, ContainerBlock) { var EditorApplication = App; var CommunicationComponent = Communication; @@ -24,8 +24,8 @@ define([ describe('model', function () { var model; - before(function() { - CommunicationComponent.getPosts = function() { + before(function () { + CommunicationComponent.getPosts = function () { var deferred = jQuery.Deferred(); return deferred; }; @@ -238,7 +238,7 @@ define([ }); it('triggers loading and loaded events for more posts', function () { - var stub = sinon.stub(CommunicationComponent, 'getPosts', function() { + var stub = sinon.stub(CommunicationComponent, 'getPosts', function () { var deferred = jQuery.Deferred(); deferred.resolve([{}]); // 1 post return deferred; @@ -291,7 +291,7 @@ define([ var view; before(function () { - CommunicationComponent.getPostTypes = function() { + CommunicationComponent.getPostTypes = function () { var deferred = jQuery.Deferred(); deferred.resolve([ { @@ -423,10 +423,10 @@ define([ expect(model.get('readMoreText')).to.equal(newValue); }); - describe('when "title only" display type is selected', function() { + describe('when "title only" display type is selected', function () { var model; var view; - beforeEach(function() { + beforeEach(function () { model = new (PostsBlock.PostsBlockModel)(); model.request = sinon.stub().returns({$el: {}}); view = new (PostsBlock.PostsBlockSettingsView)({model: model}); @@ -438,8 +438,8 @@ define([ expect(view.$('.mailpoet_posts_title_as_list')).to.not.have.$class('mailpoet_hidden'); }); - describe('when "title as list" is selected', function() { - beforeEach(function() { + describe('when "title as list" is selected', function () { + beforeEach(function () { view.$('.mailpoet_posts_display_type').val('titleOnly').change(); view.$('.mailpoet_posts_title_format').val('ul').change(); }); @@ -449,14 +449,14 @@ define([ expect(view.$('.mailpoet_posts_title_as_link')).to.have.$class('mailpoet_hidden'); }); - it('is set to "yes"', function() { + it('is set to "yes"', function () { expect(model.get('titleIsLink')).to.equal(true); }); }); }); - describe('when "title as list" is deselected', function() { - before(function() { + describe('when "title as list" is deselected', function () { + before(function () { view.$('.mailpoet_posts_title_format').val('ul').change(); view.$('.mailpoet_posts_title_format').val('h3').change(); }); diff --git a/tests/javascript/newsletter_editor/blocks/social.spec.js b/tests/javascript/newsletter_editor/blocks/social.spec.js index cacfb940d1..27444b6105 100644 --- a/tests/javascript/newsletter_editor/blocks/social.spec.js +++ b/tests/javascript/newsletter_editor/blocks/social.spec.js @@ -5,7 +5,7 @@ define([ 'newsletter_editor/App', 'newsletter_editor/blocks/social', 'backbone' -], function(EditorApplication, SocialBlock, Backbone) { +], function (EditorApplication, SocialBlock, Backbone) { describe('Social', function () { describe('block model', function () { @@ -257,18 +257,18 @@ define([ view.render(); }); - it('updates icons in settings if iconset changes', function() { + it('updates icons in settings if iconset changes', function () { view.$('.mailpoet_social_icon_set').last().click(); expect(view.$('.mailpoet_social_icon_field_image').val()).to.equal(EditorApplication.getAvailableStyles().get('socialIconSets.light.custom')); }); - it('removes the icon when "remove" is clicked', function() { + it('removes the icon when "remove" is clicked', function () { view.$('.mailpoet_delete_block').click(); expect(model.get('icons').length).to.equal(0); expect(view.$('.mailpoet_social_icon_settings').length).to.equal(0); }); - it('adds another icon when "Add another social network" is pressed', function() { + it('adds another icon when "Add another social network" is pressed', function () { view.$('.mailpoet_add_social_icon').click(); expect(model.get('icons').length).to.equal(2); }); diff --git a/tests/javascript/newsletter_editor/blocks/spacer.spec.js b/tests/javascript/newsletter_editor/blocks/spacer.spec.js index 56db09f18b..1b27793edc 100644 --- a/tests/javascript/newsletter_editor/blocks/spacer.spec.js +++ b/tests/javascript/newsletter_editor/blocks/spacer.spec.js @@ -4,7 +4,7 @@ const sinon = global.sinon; define([ 'newsletter_editor/App', 'newsletter_editor/blocks/spacer' -], function(App, SpacerBlock) { +], function (App, SpacerBlock) { var EditorApplication = App; describe('Spacer', function () { @@ -139,7 +139,7 @@ define([ describe('once rendered', function () { var view; var model; - beforeEach(function() { + beforeEach(function () { global.stubChannel(EditorApplication); global.stubConfig(EditorApplication); model = new (SpacerBlock.SpacerBlockModel)(); diff --git a/tests/javascript/newsletter_editor/blocks/text.spec.js b/tests/javascript/newsletter_editor/blocks/text.spec.js index 94105c1ceb..e742fe7606 100644 --- a/tests/javascript/newsletter_editor/blocks/text.spec.js +++ b/tests/javascript/newsletter_editor/blocks/text.spec.js @@ -3,7 +3,7 @@ const expect = global.expect; define([ 'newsletter_editor/App', 'newsletter_editor/blocks/text' -], function(EditorApplication, TextBlock) { +], function (EditorApplication, TextBlock) { describe('Text', function () { describe('model', function () { diff --git a/tests/javascript/newsletter_editor/components/communication.spec.js b/tests/javascript/newsletter_editor/components/communication.spec.js index 810461e79b..da5dfe3789 100644 --- a/tests/javascript/newsletter_editor/components/communication.spec.js +++ b/tests/javascript/newsletter_editor/components/communication.spec.js @@ -6,14 +6,14 @@ define([ 'newsletter_editor/App', 'newsletter_editor/components/communication', 'amd-inject-loader!newsletter_editor/components/communication' -], function(EditorApplication, Communication, CommunicationInjector) { +], function (EditorApplication, Communication, CommunicationInjector) { - describe('getPostTypes', function() { - it('fetches post types from the server', function() { + describe('getPostTypes', function () { + it('fetches post types from the server', function () { var module = CommunicationInjector({ mailpoet: { Ajax: { - post: function() { + post: function () { var deferred = jQuery.Deferred(); deferred.resolve({ data: { @@ -26,14 +26,14 @@ define([ } } }); - module.getPostTypes().done(function(types) { + module.getPostTypes().done(function (types) { expect(types).to.eql(['val1', 'val2']); }); }); - it('caches results', function() { + it('caches results', function () { var deferred = jQuery.Deferred(); - var mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred); + var mock = sinon.mock({ post: function () {} }).expects('post').once().returns(deferred); var module = CommunicationInjector({ mailpoet: { Ajax: { @@ -52,10 +52,10 @@ define([ }); }); - describe('getTaxonomies', function() { - it('sends post type to endpoint', function() { + describe('getTaxonomies', function () { + it('sends post type to endpoint', function () { var spy; - var post = function() { + var post = function () { var deferred = jQuery.Deferred(); deferred.resolve({ category: 'val1', @@ -77,11 +77,11 @@ define([ expect(spy.args[0][0].data.postType).to.equal('post'); }); - it('fetches taxonomies from the server', function() { + it('fetches taxonomies from the server', function () { var module = CommunicationInjector({ mailpoet: { Ajax: { - post: function() { + post: function () { var deferred = jQuery.Deferred(); deferred.resolve({ data: { @@ -93,14 +93,14 @@ define([ } } }); - module.getTaxonomies('page').done(function(types) { + module.getTaxonomies('page').done(function (types) { expect(types).to.eql({ category: 'val1' }); }); }); - it('caches results', function() { + it('caches results', function () { var deferred = jQuery.Deferred(); - var mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred); + var mock = sinon.mock({ post: function () {} }).expects('post').once().returns(deferred); var module = CommunicationInjector({ mailpoet: { Ajax: { @@ -116,10 +116,10 @@ define([ }); }); - describe('getTerms', function() { - it('sends terms to endpoint', function() { + describe('getTerms', function () { + it('sends terms to endpoint', function () { var spy; - var post = function() { + var post = function () { var deferred = jQuery.Deferred(); deferred.resolve({}); return deferred; @@ -140,11 +140,11 @@ define([ expect(spy.args[0][0].data.taxonomies).to.eql(['category', 'post_tag']); }); - it('fetches terms from the server', function() { + it('fetches terms from the server', function () { var module = CommunicationInjector({ mailpoet: { Ajax: { - post: function() { + post: function () { var deferred = jQuery.Deferred(); deferred.resolve({ data: { @@ -157,14 +157,14 @@ define([ } } }); - module.getTerms({ taxonomies: ['category'] }).done(function(types) { + module.getTerms({ taxonomies: ['category'] }).done(function (types) { expect(types).to.eql({ term1: 'term1val1', term2: 'term2val2' }); }); }); - it('caches results', function() { + it('caches results', function () { var deferred = jQuery.Deferred(); - var mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred); + var mock = sinon.mock({ post: function () {} }).expects('post').once().returns(deferred); var module = CommunicationInjector({ mailpoet: { Ajax: { @@ -180,10 +180,10 @@ define([ }); }); - describe('getPosts', function() { - it('sends options to endpoint', function() { + describe('getPosts', function () { + it('sends options to endpoint', function () { var spy; - var post = function() { + var post = function () { var deferred = jQuery.Deferred(); deferred.resolve({}); return deferred; @@ -208,11 +208,11 @@ define([ }); }); - it('fetches posts from the server', function() { + it('fetches posts from the server', function () { var module = CommunicationInjector({ mailpoet: { Ajax: { - post: function() { + post: function () { var deferred = jQuery.Deferred(); deferred.resolve({ data: [ @@ -225,14 +225,14 @@ define([ } } }); - module.getPosts().done(function(posts) { + module.getPosts().done(function (posts) { expect(posts).to.eql([{post_title: 'title 1'}, {post_title: 'post title 2'}]); }); }); - it('caches results', function() { + it('caches results', function () { var deferred = jQuery.Deferred(); - var mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred); + var mock = sinon.mock({ post: function () {} }).expects('post').once().returns(deferred); var module = CommunicationInjector({ mailpoet: { Ajax: { @@ -251,10 +251,10 @@ define([ }); }); - describe('getTransformedPosts', function() { - it('sends options to endpoint', function() { + describe('getTransformedPosts', function () { + it('sends options to endpoint', function () { var spy; - var post = function() { + var post = function () { var deferred = jQuery.Deferred(); deferred.resolve({}); return deferred; @@ -279,11 +279,11 @@ define([ }); }); - it('fetches transformed posts from the server', function() { + it('fetches transformed posts from the server', function () { var module = CommunicationInjector({ mailpoet: { Ajax: { - post: function() { + post: function () { var deferred = jQuery.Deferred(); deferred.resolve({ data: [ @@ -296,14 +296,14 @@ define([ } } }); - module.getTransformedPosts().done(function(posts) { + module.getTransformedPosts().done(function (posts) { expect(posts).to.eql([{type: 'text', text: 'something'}, {type: 'text', text: 'something else'}]); }); }); - it('caches results', function() { + it('caches results', function () { var deferred = jQuery.Deferred(); - var mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred); + var mock = sinon.mock({ post: function () {} }).expects('post').once().returns(deferred); var module = CommunicationInjector({ mailpoet: { Ajax: { diff --git a/tests/javascript/newsletter_editor/components/config.spec.js b/tests/javascript/newsletter_editor/components/config.spec.js index 530bf2c76e..ae82d98861 100644 --- a/tests/javascript/newsletter_editor/components/config.spec.js +++ b/tests/javascript/newsletter_editor/components/config.spec.js @@ -3,10 +3,10 @@ const expect = global.expect; define([ 'newsletter_editor/App', 'newsletter_editor/components/config' -], function(EditorApplication, ConfigComponent) { +], function (EditorApplication, ConfigComponent) { describe('Config', function () { - it('loads and stores configuration', function() { + it('loads and stores configuration', function () { var model; ConfigComponent.setConfig({ testConfig: 'testValue' diff --git a/tests/javascript/newsletter_editor/components/content.spec.js b/tests/javascript/newsletter_editor/components/content.spec.js index 986cd2126e..2f9820b956 100644 --- a/tests/javascript/newsletter_editor/components/content.spec.js +++ b/tests/javascript/newsletter_editor/components/content.spec.js @@ -6,14 +6,14 @@ const _ = global._; define([ 'newsletter_editor/App', 'newsletter_editor/components/content' -], function(App, ContentComponent) { +], function (App, ContentComponent) { var EditorApplication = App; - describe('Content', function() { - describe('newsletter model', function() { + describe('Content', function () { + describe('newsletter model', function () { var model; - beforeEach(function() { + beforeEach(function () { model = new (ContentComponent.NewsletterModel)({ body: { globalStyles: { @@ -29,8 +29,8 @@ define([ }); }); - it('triggers autosave on change', function() { - var mock = sinon.mock({ trigger: function() {} }).expects('trigger').once().withArgs('autoSave'); + it('triggers autosave on change', function () { + var mock = sinon.mock({ trigger: function () {} }).expects('trigger').once().withArgs('autoSave'); global.stubChannel(EditorApplication, { trigger: mock }); @@ -38,13 +38,13 @@ define([ mock.verify(); }); - it('does not include styles and content properties in its JSON', function() { + it('does not include styles and content properties in its JSON', function () { var json = model.toJSON(); expect(json).to.deep.equal({subject: 'my test subject'}); }); - describe('toJSON()', function() { - it('will only contain properties modifiable by the editor', function() { + describe('toJSON()', function () { + it('will only contain properties modifiable by the editor', function () { var model = new (ContentComponent.NewsletterModel)({ id: 19, subject: 'some subject', @@ -63,8 +63,8 @@ define([ }); }); - describe('block types', function() { - it('registers a block type view and model', function() { + describe('block types', function () { + it('registers a block type view and model', function () { var blockModel = new Backbone.SuperModel(); var blockView = new Backbone.View(); ContentComponent.registerBlockType('testType', { @@ -76,8 +76,8 @@ define([ }); }); - describe('transformation to json', function() { - it('includes content, globalStyles and initial newsletter fields', function() { + describe('transformation to json', function () { + it('includes content, globalStyles and initial newsletter fields', function () { var json; var dataField = { containerModelField: 'containerModelValue' @@ -89,20 +89,20 @@ define([ subject: 'test newsletter subject' }; EditorApplication._contentContainer = { - toJSON: function() { + toJSON: function () { return dataField; } }; - EditorApplication.getGlobalStyles = function() { + EditorApplication.getGlobalStyles = function () { return { - toJSON: function() { + toJSON: function () { return stylesField; } }; }; - EditorApplication.getNewsletter = function() { + EditorApplication.getNewsletter = function () { return { - toJSON: function() { + toJSON: function () { return newsletterFields; } }; diff --git a/tests/javascript/newsletter_editor/components/heading.spec.js b/tests/javascript/newsletter_editor/components/heading.spec.js index 76b1d93722..d36b989802 100644 --- a/tests/javascript/newsletter_editor/components/heading.spec.js +++ b/tests/javascript/newsletter_editor/components/heading.spec.js @@ -4,12 +4,12 @@ const Backbone = global.Backbone; define([ 'newsletter_editor/App', 'newsletter_editor/components/heading' -], function(EditorApplication, HeadingComponent) { +], function (EditorApplication, HeadingComponent) { - describe('Heading', function() { - describe('view', function() { + describe('Heading', function () { + describe('view', function () { var view; - beforeEach(function() { + beforeEach(function () { var model = new Backbone.SuperModel({ subject: 'a test subject' }); @@ -18,14 +18,14 @@ define([ }); }); - it('renders', function() { + it('renders', function () { expect(view.render).to.not.throw(); }); - describe('once rendered', function() { + describe('once rendered', function () { var view; var model; - beforeEach(function() { + beforeEach(function () { model = new Backbone.SuperModel({ subject: 'a test subject', preheader: 'a test preheader' @@ -36,12 +36,12 @@ define([ view.render(); }); - it('changes the model when subject field is changed', function() { + it('changes the model when subject field is changed', function () { view.$('.mailpoet_input_title').val('a new testing subject').keyup(); expect(model.get('subject')).to.equal('a new testing subject'); }); - it('changes the model when preheader field is changed', function() { + it('changes the model when preheader field is changed', function () { view.$('.mailpoet_input_preheader').val('a new testing preheader').keyup(); expect(model.get('preheader')).to.equal('a new testing preheader'); }); diff --git a/tests/javascript/newsletter_editor/components/save.spec.js b/tests/javascript/newsletter_editor/components/save.spec.js index 84d21913ec..be55eb4fc6 100644 --- a/tests/javascript/newsletter_editor/components/save.spec.js +++ b/tests/javascript/newsletter_editor/components/save.spec.js @@ -6,23 +6,23 @@ define([ 'newsletter_editor/components/save', 'amd-inject-loader!newsletter_editor/components/save', 'jquery' -], function(App, SaveComponent, SaveInjector, jQuery) { +], function (App, SaveComponent, SaveInjector, jQuery) { var EditorApplication = App; - describe('Save', function() { - describe('save method', function() { + describe('Save', function () { + describe('save method', function () { var module; - before(function() { + before(function () { module = SaveInjector({ 'newsletter_editor/components/communication': { - saveNewsletter: function() { + saveNewsletter: function () { return jQuery.Deferred(); } } }); }); - it('triggers beforeEditorSave event', function() { + it('triggers beforeEditorSave event', function () { var spy = sinon.spy(); global.stubChannel(EditorApplication, { trigger: spy @@ -37,7 +37,7 @@ define([ expect(spy).to.have.been.calledWith('beforeEditorSave'); }); - it('triggers afterEditorSave event', function() { + it('triggers afterEditorSave event', function () { var module; var spy = sinon.spy(); var promise = jQuery.Deferred(); @@ -59,7 +59,7 @@ define([ expect(spy.withArgs('afterEditorSave').calledOnce).to.be.true;// eslint-disable-line no-unused-expressions }); - it('sends newsletter json to server for saving', function() { + it('sends newsletter json to server for saving', function () { var mock = sinon.mock().once().returns(jQuery.Deferred()); var module = SaveInjector({ 'newsletter_editor/components/communication': { @@ -74,7 +74,7 @@ define([ mock.verify(); }); - it('encodes newsletter body in JSON format', function() { + it('encodes newsletter body in JSON format', function () { var module; var body = {type: 'testType'}; var mock = sinon.mock() @@ -100,28 +100,28 @@ define([ }); - describe('view', function() { + describe('view', function () { var view; - before(function() { + before(function () { EditorApplication._contentContainer = { isValid: sinon.stub().returns(true) }; global.stubConfig(EditorApplication); view = new (SaveComponent.SaveView)(); }); - it('renders', function() { + it('renders', function () { expect(view.render).to.not.throw(); }); - describe('once rendered', function() { + describe('once rendered', function () { var view; - beforeEach(function() { + beforeEach(function () { EditorApplication._contentContainer = { isValid: sinon.stub().returns(true) }; view = new (SaveComponent.SaveView)(); view.render(); }); - it('triggers newsletter saving when clicked on save button', function() { - var mock = sinon.mock({ request: function() {} }).expects('request').once().withArgs('save'); + it('triggers newsletter saving when clicked on save button', function () { + var mock = sinon.mock({ request: function () {} }).expects('request').once().withArgs('save'); global.stubChannel(EditorApplication, { request: mock }); @@ -130,19 +130,19 @@ define([ mock.verify(); }); - it('displays saving options when clicked on save options button', function() { + it('displays saving options when clicked on save options button', function () { view.$('.mailpoet_save_show_options').click(); expect(view.$('.mailpoet_save_options')).to.not.have.$class('mailpoet_hidden'); }); - it('triggers template saving when clicked on "save as template" button', function() { - var mock = sinon.mock({ post: function() {} }).expects('post').once().returns(jQuery.Deferred()); + it('triggers template saving when clicked on "save as template" button', function () { + var mock = sinon.mock({ post: function () {} }).expects('post').once().returns(jQuery.Deferred()); var html2canvasMock = jQuery.Deferred(); var module; var view; html2canvasMock.resolve({ - toDataURL: function() { return 'somedataurl'; } + toDataURL: function () { return 'somedataurl'; } }); EditorApplication.getBody = sinon.stub(); @@ -152,18 +152,18 @@ define([ post: mock }, I18n: { - t: function() { return ''; } + t: function () { return ''; } }, Notice: { - success: function() {}, - error: function() {} + success: function () {}, + error: function () {} }, - trackEvent: function() {} + trackEvent: function () {} }, 'newsletter_editor/App': EditorApplication, - html2canvas: function() { + html2canvas: function () { return { - then: function() { return html2canvasMock; } + then: function () { return html2canvasMock; } }; } }); @@ -177,12 +177,12 @@ define([ mock.verify(); }); - it('saves newsletter when clicked on "next" button', function() { + it('saves newsletter when clicked on "next" button', function () { var spy = sinon.spy(); var view; var module = SaveInjector({ 'newsletter_editor/components/communication': { - saveNewsletter: function() { + saveNewsletter: function () { return jQuery.Deferred(); } } diff --git a/tests/javascript/newsletter_editor/components/sidebar.spec.js b/tests/javascript/newsletter_editor/components/sidebar.spec.js index 4452960fd6..730fdff204 100644 --- a/tests/javascript/newsletter_editor/components/sidebar.spec.js +++ b/tests/javascript/newsletter_editor/components/sidebar.spec.js @@ -4,53 +4,53 @@ const Backbone = global.Backbone; define([ 'newsletter_editor/App', 'newsletter_editor/components/sidebar' -], function(EditorApplication, SidebarComponent) { +], function (EditorApplication, SidebarComponent) { - describe('Sidebar', function() { - describe('content view', function() { + describe('Sidebar', function () { + describe('content view', function () { var view; - beforeEach(function() { + beforeEach(function () { view = new (SidebarComponent.SidebarWidgetsView)({ collection: new Backbone.Collection([]) }); }); - it('renders', function() { + it('renders', function () { expect(view.render).to.not.throw(); }); }); - describe('layout view', function() { + describe('layout view', function () { var view; - beforeEach(function() { + beforeEach(function () { view = new (SidebarComponent.SidebarLayoutWidgetsView)({ collection: new Backbone.Collection([]) }); }); - it('renders', function() { + it('renders', function () { expect(view.render).to.not.throw(); }); }); - describe('styles view', function() { + describe('styles view', function () { var view; - beforeEach(function() { + beforeEach(function () { view = new (SidebarComponent.SidebarStylesView)({ model: new Backbone.SuperModel({}), availableStyles: new Backbone.SuperModel({}) }); }); - it('renders', function() { + it('renders', function () { expect(view.render).to.not.throw(); }); - describe('once rendered', function() { + describe('once rendered', function () { var model; var availableStyles; var view; - before(function() { + before(function () { model = new Backbone.SuperModel({ text: { fontColor: '#000000', @@ -96,95 +96,95 @@ define([ view.render(); }); - it('changes model if text font color field changes', function() { + it('changes model if text font color field changes', function () { view.$('#mailpoet_text_font_color').val('#123456').change(); expect(model.get('text.fontColor')).to.equal('#123456'); }); - it('changes model if h1 font color field changes', function() { + it('changes model if h1 font color field changes', function () { view.$('#mailpoet_h1_font_color').val('#123457').change(); expect(model.get('h1.fontColor')).to.equal('#123457'); }); - it('changes model if h2 font color field changes', function() { + it('changes model if h2 font color field changes', function () { view.$('#mailpoet_h2_font_color').val('#123458').change(); expect(model.get('h2.fontColor')).to.equal('#123458'); }); - it('changes model if h3 font color field changes', function() { + it('changes model if h3 font color field changes', function () { view.$('#mailpoet_h3_font_color').val('#123426').change(); expect(model.get('h3.fontColor')).to.equal('#123426'); }); - it('changes model if link font color field changes', function() { + it('changes model if link font color field changes', function () { view.$('#mailpoet_a_font_color').val('#323232').change(); expect(model.get('link.fontColor')).to.equal('#323232'); }); - it('changes model if newsletter background color field changes', function() { + it('changes model if newsletter background color field changes', function () { view.$('#mailpoet_newsletter_background_color').val('#636237').change(); expect(model.get('wrapper.backgroundColor')).to.equal('#636237'); }); - it('changes model if background color field changes', function() { + it('changes model if background color field changes', function () { view.$('#mailpoet_background_color').val('#878587').change(); expect(model.get('body.backgroundColor')).to.equal('#878587'); }); - it('changes model if text font family field changes', function() { + it('changes model if text font family field changes', function () { view.$('#mailpoet_text_font_family').val('Times New Roman').change(); expect(model.get('text.fontFamily')).to.equal('Times New Roman'); }); - it('changes model if h1 font family field changes', function() { + it('changes model if h1 font family field changes', function () { view.$('#mailpoet_h1_font_family').val('Comic Sans').change(); expect(model.get('h1.fontFamily')).to.equal('Comic Sans'); }); - it('changes model if h2 font family field changes', function() { + it('changes model if h2 font family field changes', function () { view.$('#mailpoet_h2_font_family').val('Tahoma').change(); expect(model.get('h2.fontFamily')).to.equal('Tahoma'); }); - it('changes model if h3 font family field changes', function() { + it('changes model if h3 font family field changes', function () { view.$('#mailpoet_h3_font_family').val('Lucida').change(); expect(model.get('h3.fontFamily')).to.equal('Lucida'); }); - it('changes model if text font size field changes', function() { + it('changes model if text font size field changes', function () { view.$('#mailpoet_text_font_size').val('9px').change(); expect(model.get('text.fontSize')).to.equal('9px'); }); - it('changes model if h1 font size field changes', function() { + it('changes model if h1 font size field changes', function () { view.$('#mailpoet_h1_font_size').val('12px').change(); expect(model.get('h1.fontSize')).to.equal('12px'); }); - it('changes model if h2 font size field changes', function() { + it('changes model if h2 font size field changes', function () { view.$('#mailpoet_h2_font_size').val('14px').change(); expect(model.get('h2.fontSize')).to.equal('14px'); }); - it('changes model if h3 font size field changes', function() { + it('changes model if h3 font size field changes', function () { view.$('#mailpoet_h3_font_size').val('16px').change(); expect(model.get('h3.fontSize')).to.equal('16px'); }); - it('changes model if link underline field changes', function() { + it('changes model if link underline field changes', function () { view.$('#mailpoet_a_font_underline').prop('checked', true).change(); expect(model.get('link.textDecoration')).to.equal('underline'); }); }); }); - describe('preview view', function() { + describe('preview view', function () { var view; - beforeEach(function() { + beforeEach(function () { view = new (SidebarComponent.SidebarPreviewView)(); }); - it('renders', function() { + it('renders', function () { expect(view.render).to.not.throw(); }); }); diff --git a/tests/javascript/newsletter_editor/components/styles.spec.js b/tests/javascript/newsletter_editor/components/styles.spec.js index 8359edec09..3f69df701d 100644 --- a/tests/javascript/newsletter_editor/components/styles.spec.js +++ b/tests/javascript/newsletter_editor/components/styles.spec.js @@ -4,11 +4,11 @@ const sinon = global.sinon; define([ 'newsletter_editor/App', 'newsletter_editor/components/styles' -], function(App, StylesComponent) { +], function (App, StylesComponent) { var EditorApplication = App; describe('Styles', function () { - it('loads and stores globally available styles', function() { + it('loads and stores globally available styles', function () { var model; StylesComponent.setGlobalStyles({ testStyle: 'testValue' @@ -17,15 +17,15 @@ define([ expect(model.get('testStyle')).to.equal('testValue'); }); - describe('model', function() { + describe('model', function () { var model; - beforeEach(function() { + beforeEach(function () { model = new (StylesComponent.StylesModel)(); }); - it('triggers autoSave when changed', function() { - var mock = sinon.mock({ trigger: function() {}}).expects('trigger').once().withExactArgs('autoSave'); - EditorApplication.getChannel = function() { + it('triggers autoSave when changed', function () { + var mock = sinon.mock({ trigger: function () {}}).expects('trigger').once().withExactArgs('autoSave'); + EditorApplication.getChannel = function () { return { trigger: mock }; @@ -35,15 +35,15 @@ define([ }); }); - describe('view', function() { + describe('view', function () { var model; var view; - beforeEach(function() { + beforeEach(function () { model = new (StylesComponent.StylesModel)(); view = new (StylesComponent.StylesView)({ model: model }); }); - it('renders', function() { + it('renders', function () { expect(view.render).to.not.throw(); }); }); From f898746967996037b6af19cb4517cfe20268c38d Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Wed, 27 Sep 2017 15:42:51 +0000 Subject: [PATCH 07/10] Tests keyword-spacing --- .eslintrc.tests.json | 1 - tests/javascript/newsletter_editor/blocks/button.spec.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index f04493a627..509c7a0444 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -10,7 +10,6 @@ "rules": { "import/no-amd": 0, "global-require": 0, - "keyword-spacing": 0, "no-bitwise": 0, "func-call-spacing": 0, "max-len": 0, diff --git a/tests/javascript/newsletter_editor/blocks/button.spec.js b/tests/javascript/newsletter_editor/blocks/button.spec.js index 1bd5183291..f38194dd3c 100644 --- a/tests/javascript/newsletter_editor/blocks/button.spec.js +++ b/tests/javascript/newsletter_editor/blocks/button.spec.js @@ -20,7 +20,7 @@ define([ }); afterEach(function () { - if(EditorApplication.getChannel) { + if (EditorApplication.getChannel) { delete EditorApplication.getChannel; } }); From b9184a202fdcd8bd620b113a36101383d05a5171 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Wed, 27 Sep 2017 15:43:28 +0000 Subject: [PATCH 08/10] Tests func-call-spacing --- .eslintrc.tests.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index 509c7a0444..0adf6b50a5 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -11,7 +11,6 @@ "import/no-amd": 0, "global-require": 0, "no-bitwise": 0, - "func-call-spacing": 0, "max-len": 0, "no-underscore-dangle": 0, "no-shadow": 0, From d6af88d6673f670130768ba13e360a4343cd4d23 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Wed, 27 Sep 2017 15:44:44 +0000 Subject: [PATCH 09/10] Tests object-curly-spacing --- .eslintrc.tests.json | 1 - tests/javascript/mochaTestHelper.js | 108 +++++++++--------- .../blocks/automatedLatestContent.spec.js | 14 +-- .../newsletter_editor/blocks/button.spec.js | 16 +-- .../blocks/container.spec.js | 10 +- .../newsletter_editor/blocks/divider.spec.js | 6 +- .../newsletter_editor/blocks/footer.spec.js | 6 +- .../newsletter_editor/blocks/header.spec.js | 6 +- .../newsletter_editor/blocks/image.spec.js | 6 +- .../newsletter_editor/blocks/posts.spec.js | 10 +- .../newsletter_editor/blocks/social.spec.js | 8 +- .../newsletter_editor/blocks/spacer.spec.js | 6 +- .../newsletter_editor/blocks/text.spec.js | 4 +- .../components/communication.spec.js | 12 +- .../components/content.spec.js | 2 +- .../newsletter_editor/components/save.spec.js | 2 +- .../components/styles.spec.js | 2 +- 17 files changed, 109 insertions(+), 110 deletions(-) diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index 0adf6b50a5..c646220a8b 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -15,7 +15,6 @@ "no-underscore-dangle": 0, "no-shadow": 0, "padded-blocks": 0, - "object-curly-spacing": 0, "func-names": 0 } } diff --git a/tests/javascript/mochaTestHelper.js b/tests/javascript/mochaTestHelper.js index 1cbdfa66bf..b78353a046 100644 --- a/tests/javascript/mochaTestHelper.js +++ b/tests/javascript/mochaTestHelper.js @@ -98,73 +98,73 @@ global.stubImage = function (defaultWidth, defaultHeight) { }; -testHelpers.loadTemplate('blocks/base/toolsGeneric.hbs', window, {id: 'newsletter_editor_template_tools_generic'}); +testHelpers.loadTemplate('blocks/base/toolsGeneric.hbs', window, { id: 'newsletter_editor_template_tools_generic' }); -testHelpers.loadTemplate('blocks/automatedLatestContent/block.hbs', window, {id: 'newsletter_editor_template_automated_latest_content_block'}); -testHelpers.loadTemplate('blocks/automatedLatestContent/widget.hbs', window, {id: 'newsletter_editor_template_automated_latest_content_widget'}); -testHelpers.loadTemplate('blocks/automatedLatestContent/settings.hbs', window, {id: 'newsletter_editor_template_automated_latest_content_settings'}); +testHelpers.loadTemplate('blocks/automatedLatestContent/block.hbs', window, { id: 'newsletter_editor_template_automated_latest_content_block' }); +testHelpers.loadTemplate('blocks/automatedLatestContent/widget.hbs', window, { id: 'newsletter_editor_template_automated_latest_content_widget' }); +testHelpers.loadTemplate('blocks/automatedLatestContent/settings.hbs', window, { id: 'newsletter_editor_template_automated_latest_content_settings' }); -testHelpers.loadTemplate('blocks/button/block.hbs', window, {id: 'newsletter_editor_template_button_block'}); -testHelpers.loadTemplate('blocks/button/widget.hbs', window, {id: 'newsletter_editor_template_button_widget'}); -testHelpers.loadTemplate('blocks/button/settings.hbs', window, {id: 'newsletter_editor_template_button_settings'}); +testHelpers.loadTemplate('blocks/button/block.hbs', window, { id: 'newsletter_editor_template_button_block' }); +testHelpers.loadTemplate('blocks/button/widget.hbs', window, { id: 'newsletter_editor_template_button_widget' }); +testHelpers.loadTemplate('blocks/button/settings.hbs', window, { id: 'newsletter_editor_template_button_settings' }); -testHelpers.loadTemplate('blocks/container/block.hbs', window, {id: 'newsletter_editor_template_container_block'}); -testHelpers.loadTemplate('blocks/container/emptyBlock.hbs', window, {id: 'newsletter_editor_template_container_block_empty'}); -testHelpers.loadTemplate('blocks/container/oneColumnLayoutWidget.hbs', window, {id: 'newsletter_editor_template_container_one_column_widget'}); -testHelpers.loadTemplate('blocks/container/twoColumnLayoutWidget.hbs', window, {id: 'newsletter_editor_template_container_two_column_widget'}); -testHelpers.loadTemplate('blocks/container/threeColumnLayoutWidget.hbs', window, {id: 'newsletter_editor_template_container_three_column_widget'}); -testHelpers.loadTemplate('blocks/container/settings.hbs', window, {id: 'newsletter_editor_template_container_settings'}); -testHelpers.loadTemplate('blocks/container/columnSettings.hbs', window, {id: 'newsletter_editor_template_container_column_settings'}); +testHelpers.loadTemplate('blocks/container/block.hbs', window, { id: 'newsletter_editor_template_container_block' }); +testHelpers.loadTemplate('blocks/container/emptyBlock.hbs', window, { id: 'newsletter_editor_template_container_block_empty' }); +testHelpers.loadTemplate('blocks/container/oneColumnLayoutWidget.hbs', window, { id: 'newsletter_editor_template_container_one_column_widget' }); +testHelpers.loadTemplate('blocks/container/twoColumnLayoutWidget.hbs', window, { id: 'newsletter_editor_template_container_two_column_widget' }); +testHelpers.loadTemplate('blocks/container/threeColumnLayoutWidget.hbs', window, { id: 'newsletter_editor_template_container_three_column_widget' }); +testHelpers.loadTemplate('blocks/container/settings.hbs', window, { id: 'newsletter_editor_template_container_settings' }); +testHelpers.loadTemplate('blocks/container/columnSettings.hbs', window, { id: 'newsletter_editor_template_container_column_settings' }); -testHelpers.loadTemplate('blocks/divider/block.hbs', window, {id: 'newsletter_editor_template_divider_block'}); -testHelpers.loadTemplate('blocks/divider/widget.hbs', window, {id: 'newsletter_editor_template_divider_widget'}); -testHelpers.loadTemplate('blocks/divider/settings.hbs', window, {id: 'newsletter_editor_template_divider_settings'}); +testHelpers.loadTemplate('blocks/divider/block.hbs', window, { id: 'newsletter_editor_template_divider_block' }); +testHelpers.loadTemplate('blocks/divider/widget.hbs', window, { id: 'newsletter_editor_template_divider_widget' }); +testHelpers.loadTemplate('blocks/divider/settings.hbs', window, { id: 'newsletter_editor_template_divider_settings' }); -testHelpers.loadTemplate('blocks/footer/block.hbs', window, {id: 'newsletter_editor_template_footer_block'}); -testHelpers.loadTemplate('blocks/footer/widget.hbs', window, {id: 'newsletter_editor_template_footer_widget'}); -testHelpers.loadTemplate('blocks/footer/settings.hbs', window, {id: 'newsletter_editor_template_footer_settings'}); +testHelpers.loadTemplate('blocks/footer/block.hbs', window, { id: 'newsletter_editor_template_footer_block' }); +testHelpers.loadTemplate('blocks/footer/widget.hbs', window, { id: 'newsletter_editor_template_footer_widget' }); +testHelpers.loadTemplate('blocks/footer/settings.hbs', window, { id: 'newsletter_editor_template_footer_settings' }); -testHelpers.loadTemplate('blocks/header/block.hbs', window, {id: 'newsletter_editor_template_header_block'}); -testHelpers.loadTemplate('blocks/header/widget.hbs', window, {id: 'newsletter_editor_template_header_widget'}); -testHelpers.loadTemplate('blocks/header/settings.hbs', window, {id: 'newsletter_editor_template_header_settings'}); +testHelpers.loadTemplate('blocks/header/block.hbs', window, { id: 'newsletter_editor_template_header_block' }); +testHelpers.loadTemplate('blocks/header/widget.hbs', window, { id: 'newsletter_editor_template_header_widget' }); +testHelpers.loadTemplate('blocks/header/settings.hbs', window, { id: 'newsletter_editor_template_header_settings' }); -testHelpers.loadTemplate('blocks/image/block.hbs', window, {id: 'newsletter_editor_template_image_block'}); -testHelpers.loadTemplate('blocks/image/widget.hbs', window, {id: 'newsletter_editor_template_image_widget'}); -testHelpers.loadTemplate('blocks/image/settings.hbs', window, {id: 'newsletter_editor_template_image_settings'}); +testHelpers.loadTemplate('blocks/image/block.hbs', window, { id: 'newsletter_editor_template_image_block' }); +testHelpers.loadTemplate('blocks/image/widget.hbs', window, { id: 'newsletter_editor_template_image_widget' }); +testHelpers.loadTemplate('blocks/image/settings.hbs', window, { id: 'newsletter_editor_template_image_settings' }); -testHelpers.loadTemplate('blocks/posts/block.hbs', window, {id: 'newsletter_editor_template_posts_block'}); -testHelpers.loadTemplate('blocks/posts/widget.hbs', window, {id: 'newsletter_editor_template_posts_widget'}); -testHelpers.loadTemplate('blocks/posts/settings.hbs', window, {id: 'newsletter_editor_template_posts_settings'}); -testHelpers.loadTemplate('blocks/posts/settingsDisplayOptions.hbs', window, {id: 'newsletter_editor_template_posts_settings_display_options'}); -testHelpers.loadTemplate('blocks/posts/settingsSelection.hbs', window, {id: 'newsletter_editor_template_posts_settings_selection'}); -testHelpers.loadTemplate('blocks/posts/settingsSelectionEmpty.hbs', window, {id: 'newsletter_editor_template_posts_settings_selection_empty'}); -testHelpers.loadTemplate('blocks/posts/settingsSinglePost.hbs', window, {id: 'newsletter_editor_template_posts_settings_single_post'}); +testHelpers.loadTemplate('blocks/posts/block.hbs', window, { id: 'newsletter_editor_template_posts_block' }); +testHelpers.loadTemplate('blocks/posts/widget.hbs', window, { id: 'newsletter_editor_template_posts_widget' }); +testHelpers.loadTemplate('blocks/posts/settings.hbs', window, { id: 'newsletter_editor_template_posts_settings' }); +testHelpers.loadTemplate('blocks/posts/settingsDisplayOptions.hbs', window, { id: 'newsletter_editor_template_posts_settings_display_options' }); +testHelpers.loadTemplate('blocks/posts/settingsSelection.hbs', window, { id: 'newsletter_editor_template_posts_settings_selection' }); +testHelpers.loadTemplate('blocks/posts/settingsSelectionEmpty.hbs', window, { id: 'newsletter_editor_template_posts_settings_selection_empty' }); +testHelpers.loadTemplate('blocks/posts/settingsSinglePost.hbs', window, { id: 'newsletter_editor_template_posts_settings_single_post' }); -testHelpers.loadTemplate('blocks/social/block.hbs', window, {id: 'newsletter_editor_template_social_block'}); -testHelpers.loadTemplate('blocks/social/blockIcon.hbs', window, {id: 'newsletter_editor_template_social_block_icon'}); -testHelpers.loadTemplate('blocks/social/widget.hbs', window, {id: 'newsletter_editor_template_social_widget'}); -testHelpers.loadTemplate('blocks/social/settings.hbs', window, {id: 'newsletter_editor_template_social_settings'}); -testHelpers.loadTemplate('blocks/social/settingsIcon.hbs', window, {id: 'newsletter_editor_template_social_settings_icon'}); -testHelpers.loadTemplate('blocks/social/settingsIconSelector.hbs', window, {id: 'newsletter_editor_template_social_settings_icon_selector'}); -testHelpers.loadTemplate('blocks/social/settingsStyles.hbs', window, {id: 'newsletter_editor_template_social_settings_styles'}); +testHelpers.loadTemplate('blocks/social/block.hbs', window, { id: 'newsletter_editor_template_social_block' }); +testHelpers.loadTemplate('blocks/social/blockIcon.hbs', window, { id: 'newsletter_editor_template_social_block_icon' }); +testHelpers.loadTemplate('blocks/social/widget.hbs', window, { id: 'newsletter_editor_template_social_widget' }); +testHelpers.loadTemplate('blocks/social/settings.hbs', window, { id: 'newsletter_editor_template_social_settings' }); +testHelpers.loadTemplate('blocks/social/settingsIcon.hbs', window, { id: 'newsletter_editor_template_social_settings_icon' }); +testHelpers.loadTemplate('blocks/social/settingsIconSelector.hbs', window, { id: 'newsletter_editor_template_social_settings_icon_selector' }); +testHelpers.loadTemplate('blocks/social/settingsStyles.hbs', window, { id: 'newsletter_editor_template_social_settings_styles' }); -testHelpers.loadTemplate('blocks/spacer/block.hbs', window, {id: 'newsletter_editor_template_spacer_block'}); -testHelpers.loadTemplate('blocks/spacer/widget.hbs', window, {id: 'newsletter_editor_template_spacer_widget'}); -testHelpers.loadTemplate('blocks/spacer/settings.hbs', window, {id: 'newsletter_editor_template_spacer_settings'}); +testHelpers.loadTemplate('blocks/spacer/block.hbs', window, { id: 'newsletter_editor_template_spacer_block' }); +testHelpers.loadTemplate('blocks/spacer/widget.hbs', window, { id: 'newsletter_editor_template_spacer_widget' }); +testHelpers.loadTemplate('blocks/spacer/settings.hbs', window, { id: 'newsletter_editor_template_spacer_settings' }); -testHelpers.loadTemplate('blocks/text/block.hbs', window, {id: 'newsletter_editor_template_text_block'}); -testHelpers.loadTemplate('blocks/text/widget.hbs', window, {id: 'newsletter_editor_template_text_widget'}); -testHelpers.loadTemplate('blocks/text/settings.hbs', window, {id: 'newsletter_editor_template_text_settings'}); +testHelpers.loadTemplate('blocks/text/block.hbs', window, { id: 'newsletter_editor_template_text_block' }); +testHelpers.loadTemplate('blocks/text/widget.hbs', window, { id: 'newsletter_editor_template_text_widget' }); +testHelpers.loadTemplate('blocks/text/settings.hbs', window, { id: 'newsletter_editor_template_text_settings' }); -testHelpers.loadTemplate('components/heading.hbs', window, {id: 'newsletter_editor_template_heading'}); -testHelpers.loadTemplate('components/save.hbs', window, {id: 'newsletter_editor_template_save'}); -testHelpers.loadTemplate('components/styles.hbs', window, {id: 'newsletter_editor_template_styles'}); +testHelpers.loadTemplate('components/heading.hbs', window, { id: 'newsletter_editor_template_heading' }); +testHelpers.loadTemplate('components/save.hbs', window, { id: 'newsletter_editor_template_save' }); +testHelpers.loadTemplate('components/styles.hbs', window, { id: 'newsletter_editor_template_styles' }); -testHelpers.loadTemplate('components/sidebar/sidebar.hbs', window, {id: 'newsletter_editor_template_sidebar'}); -testHelpers.loadTemplate('components/sidebar/content.hbs', window, {id: 'newsletter_editor_template_sidebar_content'}); -testHelpers.loadTemplate('components/sidebar/layout.hbs', window, {id: 'newsletter_editor_template_sidebar_layout'}); -testHelpers.loadTemplate('components/sidebar/preview.hbs', window, {id: 'newsletter_editor_template_sidebar_preview'}); -testHelpers.loadTemplate('components/sidebar/styles.hbs', window, {id: 'newsletter_editor_template_sidebar_styles'}); +testHelpers.loadTemplate('components/sidebar/sidebar.hbs', window, { id: 'newsletter_editor_template_sidebar' }); +testHelpers.loadTemplate('components/sidebar/content.hbs', window, { id: 'newsletter_editor_template_sidebar_content' }); +testHelpers.loadTemplate('components/sidebar/layout.hbs', window, { id: 'newsletter_editor_template_sidebar_layout' }); +testHelpers.loadTemplate('components/sidebar/preview.hbs', window, { id: 'newsletter_editor_template_sidebar_preview' }); +testHelpers.loadTemplate('components/sidebar/styles.hbs', window, { id: 'newsletter_editor_template_sidebar_styles' }); global.templates = { diff --git a/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js b/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js index 126a59dc05..73d72825ad 100644 --- a/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js +++ b/tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js @@ -283,7 +283,7 @@ define([ EditorApplication.getBlockTypeModel = sinon.stub().returns(Backbone.Model); EditorApplication.getBlockTypeView = sinon.stub().returns(Backbone.View); model = new (module.AutomatedLatestContentBlockModel)(); - view = new (module.AutomatedLatestContentBlockView)({model: model}); + view = new (module.AutomatedLatestContentBlockView)({ model: model }); }); afterEach(function () { @@ -302,11 +302,11 @@ define([ beforeEach(function () { onStub = sinon.stub(); - global.stubChannel(EditorApplication, {on: onStub}); + global.stubChannel(EditorApplication, { on: onStub }); global.stubConfig(EditorApplication); EditorApplication.getBlockTypeModel = sinon.stub().returns(Backbone.Model); EditorApplication.getBlockTypeView = sinon.stub().returns(Backbone.View); - view = new (AutomatedLatestContentBlock.AutomatedLatestContentBlockView)({model: {set: sinon.stub()}}); + view = new (AutomatedLatestContentBlock.AutomatedLatestContentBlockView)({ model: { set: sinon.stub() } }); }); it('listens to the event', function () { @@ -380,7 +380,7 @@ define([ beforeEach(function () { model = new (module.AutomatedLatestContentBlockModel)(); - view = new (module.AutomatedLatestContentBlockSettingsView)({model: model}); + view = new (module.AutomatedLatestContentBlockSettingsView)({ model: model }); }); after(function () { @@ -394,7 +394,7 @@ define([ describe('once rendered', function () { beforeEach(function () { model = new (module.AutomatedLatestContentBlockModel)(); - view = new (module.AutomatedLatestContentBlockSettingsView)({model: model}); + view = new (module.AutomatedLatestContentBlockSettingsView)({ model: model }); view.render(); }); @@ -505,7 +505,7 @@ define([ var view; beforeEach(function () { model = new (module.AutomatedLatestContentBlockModel)(); - view = new (module.AutomatedLatestContentBlockSettingsView)({model: model}); + view = new (module.AutomatedLatestContentBlockSettingsView)({ model: model }); view.render(); view.$('.mailpoet_automated_latest_content_display_type').val('titleOnly').change(); }); @@ -519,7 +519,7 @@ define([ var view; beforeEach(function () { model = new (module.AutomatedLatestContentBlockModel)(); - view = new (module.AutomatedLatestContentBlockSettingsView)({model: model}); + view = new (module.AutomatedLatestContentBlockSettingsView)({ model: model }); view.render(); view.$('.mailpoet_automated_latest_content_display_type').val('titleOnly').change(); view.$('.mailpoet_automated_latest_content_title_format').val('ul').change(); diff --git a/tests/javascript/newsletter_editor/blocks/button.spec.js b/tests/javascript/newsletter_editor/blocks/button.spec.js index f38194dd3c..f75f57fd06 100644 --- a/tests/javascript/newsletter_editor/blocks/button.spec.js +++ b/tests/javascript/newsletter_editor/blocks/button.spec.js @@ -159,13 +159,13 @@ define([ }); it('renders', function () { - var view = new (ButtonBlock.ButtonBlockView)({model: model}); + var view = new (ButtonBlock.ButtonBlockView)({ model: model }); expect(view.render).to.not.throw(); expect(view.$('.mailpoet_editor_button')).to.have.length(1); }); it('rerenders when attributes change', function () { - var view = new (ButtonBlock.ButtonBlockView)({model: model}); + var view = new (ButtonBlock.ButtonBlockView)({ model: model }); view.render(); model.set('text', 'Some new text'); @@ -198,7 +198,7 @@ define([ } } }); - view = new (ButtonBlock.ButtonBlockView)({model: model}); + view = new (ButtonBlock.ButtonBlockView)({ model: model }); view.render(); }); @@ -272,9 +272,9 @@ define([ beforeEach(function () { onStub = sinon.stub(); - global.stubChannel(EditorApplication, {on: onStub}); - model = {set: sinon.stub(), toJSON: sinon.stub()}; - view = new (ButtonBlock.ButtonBlockView)({model: model}); + global.stubChannel(EditorApplication, { on: onStub }); + model = { set: sinon.stub(), toJSON: sinon.stub() }; + view = new (ButtonBlock.ButtonBlockView)({ model: model }); view.render(); }); @@ -315,7 +315,7 @@ define([ }); it('renders', function () { - var view = new (ButtonBlock.ButtonBlockSettingsView)({model: model}); + var view = new (ButtonBlock.ButtonBlockSettingsView)({ model: model }); expect(view.render).to.not.throw(); }); @@ -336,7 +336,7 @@ define([ type: 'button', text: 'Some random text' }); - view = new (ButtonBlock.ButtonBlockSettingsView)({model: model}); + view = new (ButtonBlock.ButtonBlockSettingsView)({ model: model }); view.render(); }); diff --git a/tests/javascript/newsletter_editor/blocks/container.spec.js b/tests/javascript/newsletter_editor/blocks/container.spec.js index ae17892770..03bb8c93f7 100644 --- a/tests/javascript/newsletter_editor/blocks/container.spec.js +++ b/tests/javascript/newsletter_editor/blocks/container.spec.js @@ -65,7 +65,7 @@ define([ model = new (ContainerBlock.ContainerBlockModel)({ type: 'container', blocks: [testModel] - }, {parse: true}); + }, { parse: true }); expect(model.get('blocks')).to.have.length(1); expect(model.get('blocks').at(0).get('type')).to.equal(testModel.type); @@ -95,7 +95,7 @@ define([ ] } ] - }, {parse: true}); + }, { parse: true }); expect(model.get('blocks')).to.have.length(1); expect(model.get('blocks').at(0).get('blocks')).to.have.length(2); @@ -114,7 +114,7 @@ define([ global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication); model = new (ContainerBlock.ContainerBlockModel)(); - view = new (ContainerBlock.ContainerBlockView)({model: model}); + view = new (ContainerBlock.ContainerBlockView)({ model: model }); it('renders', function () { expect(view.render).to.not.throw(); @@ -196,7 +196,7 @@ define([ global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication); model = new (ContainerBlock.ContainerBlockModel)(); - view = new (ContainerBlock.ContainerBlockSettingsView)({model: model}); + view = new (ContainerBlock.ContainerBlockSettingsView)({ model: model }); it('renders', function () { expect(view.render).to.not.throw(); @@ -209,7 +209,7 @@ define([ global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication); model = new (ContainerBlock.ContainerBlockModel)(); - view = new (ContainerBlock.ContainerBlockSettingsView)({model: model}); + view = new (ContainerBlock.ContainerBlockSettingsView)({ model: model }); }); it('updates the model when background color changes', function () { diff --git a/tests/javascript/newsletter_editor/blocks/divider.spec.js b/tests/javascript/newsletter_editor/blocks/divider.spec.js index 472af90cee..54209bfeac 100644 --- a/tests/javascript/newsletter_editor/blocks/divider.spec.js +++ b/tests/javascript/newsletter_editor/blocks/divider.spec.js @@ -104,7 +104,7 @@ define([ global.stubChannel(EditorApplication); global.stubConfig(EditorApplication); model = new (DividerBlock.DividerBlockModel)(); - view = new (DividerBlock.DividerBlockView)({model: model}); + view = new (DividerBlock.DividerBlockView)({ model: model }); }); it('renders', function () { @@ -146,7 +146,7 @@ define([ dividers: ['solid', 'inset'] }); model = new (DividerBlock.DividerBlockModel)(); - view = new (DividerBlock.DividerBlockSettingsView)({model: model}); + view = new (DividerBlock.DividerBlockSettingsView)({ model: model }); it('renders', function () { expect(view.render).to.not.throw(); @@ -166,7 +166,7 @@ define([ beforeEach(function () { model = new (DividerBlock.DividerBlockModel)(); - view = new (DividerBlock.DividerBlockSettingsView)({model: model}); + view = new (DividerBlock.DividerBlockSettingsView)({ model: model }); view.render(); }); diff --git a/tests/javascript/newsletter_editor/blocks/footer.spec.js b/tests/javascript/newsletter_editor/blocks/footer.spec.js index 91a0d7a7a9..c6ba85f7ae 100644 --- a/tests/javascript/newsletter_editor/blocks/footer.spec.js +++ b/tests/javascript/newsletter_editor/blocks/footer.spec.js @@ -126,7 +126,7 @@ define([ beforeEach(function () { global.stubChannel(EditorApplication); - view = new (FooterBlock.FooterBlockView)({model: model}); + view = new (FooterBlock.FooterBlockView)({ model: model }); }); it('renders', function () { @@ -144,7 +144,7 @@ define([ textSizes: ['16px', '20px'] }); model = new (FooterBlock.FooterBlockModel)(); - view = new (FooterBlock.FooterBlockSettingsView)({model: model}); + view = new (FooterBlock.FooterBlockSettingsView)({ model: model }); it('renders', function () { expect(view.render).to.not.throw(); @@ -162,7 +162,7 @@ define([ textSizes: ['16px', '20px'] }); model = new (FooterBlock.FooterBlockModel)({}); - view = new (FooterBlock.FooterBlockSettingsView)({model: model}); + view = new (FooterBlock.FooterBlockSettingsView)({ model: model }); view.render(); }); diff --git a/tests/javascript/newsletter_editor/blocks/header.spec.js b/tests/javascript/newsletter_editor/blocks/header.spec.js index 02ff11e0f0..a90ed54485 100644 --- a/tests/javascript/newsletter_editor/blocks/header.spec.js +++ b/tests/javascript/newsletter_editor/blocks/header.spec.js @@ -125,7 +125,7 @@ define([ beforeEach(function () { global.stubChannel(EditorApplication); - view = new (HeaderBlock.HeaderBlockView)({model: model}); + view = new (HeaderBlock.HeaderBlockView)({ model: model }); }); it('renders', function () { @@ -144,7 +144,7 @@ define([ textSizes: ['16px', '20px'] }); model = new (HeaderBlock.HeaderBlockModel)(); - view = new (HeaderBlock.HeaderBlockSettingsView)({model: model}); + view = new (HeaderBlock.HeaderBlockSettingsView)({ model: model }); it('renders', function () { expect(view.render).to.not.throw(); @@ -162,7 +162,7 @@ define([ textSizes: ['16px', '20px'] }); model = new (HeaderBlock.HeaderBlockModel)({}); - view = new (HeaderBlock.HeaderBlockSettingsView)({model: model}); + view = new (HeaderBlock.HeaderBlockSettingsView)({ model: model }); view.render(); }); diff --git a/tests/javascript/newsletter_editor/blocks/image.spec.js b/tests/javascript/newsletter_editor/blocks/image.spec.js index 932abb8196..95b7febd85 100644 --- a/tests/javascript/newsletter_editor/blocks/image.spec.js +++ b/tests/javascript/newsletter_editor/blocks/image.spec.js @@ -113,7 +113,7 @@ define([ model = new (ImageBlock.ImageBlockModel)(); beforeEach(function () { - view = new (ImageBlock.ImageBlockView)({model: model}); + view = new (ImageBlock.ImageBlockView)({ model: model }); }); it('renders', function () { @@ -133,7 +133,7 @@ define([ src: 'http://example.org/someimage.png', alt: 'some alt' }); - view = new (ImageBlock.ImageBlockView)({model: model}); + view = new (ImageBlock.ImageBlockView)({ model: model }); view.render(); }); @@ -174,7 +174,7 @@ define([ }); global.stubImage(newWidth, newHeight); model = new (ImageBlock.ImageBlockModel)(); - view = new (ImageBlock.ImageBlockSettingsView)({model: model}); + view = new (ImageBlock.ImageBlockSettingsView)({ model: model }); }); it('renders', function () { diff --git a/tests/javascript/newsletter_editor/blocks/posts.spec.js b/tests/javascript/newsletter_editor/blocks/posts.spec.js index fafb88c6b0..6ccf119430 100644 --- a/tests/javascript/newsletter_editor/blocks/posts.spec.js +++ b/tests/javascript/newsletter_editor/blocks/posts.spec.js @@ -270,7 +270,7 @@ define([ global.stubConfig(EditorApplication); EditorApplication.getBlockTypeModel = sinon.stub().returns(Backbone.Model); model = new (PostsBlock.PostsBlockModel)(); - view = new (PostsBlock.PostsBlockView)({model: model}); + view = new (PostsBlock.PostsBlockView)({ model: model }); // Disable auto-opening of settings view view.off('showSettings'); @@ -322,12 +322,12 @@ define([ }); EditorApplication.getBlockTypeModel = sinon.stub().returns(ContainerBlock.ContainerBlockModel); model = new (PostsBlock.PostsBlockModel)(); - view = new (PostsBlock.PostsBlockSettingsView)({model: model}); + view = new (PostsBlock.PostsBlockSettingsView)({ model: model }); }); it('renders', function () { // Stub out block view requests - model.request = sinon.stub().returns({$el: {}}); + model.request = sinon.stub().returns({ $el: {} }); expect(view.render).to.not.throw(); }); @@ -428,8 +428,8 @@ define([ var view; beforeEach(function () { model = new (PostsBlock.PostsBlockModel)(); - model.request = sinon.stub().returns({$el: {}}); - view = new (PostsBlock.PostsBlockSettingsView)({model: model}); + model.request = sinon.stub().returns({ $el: {} }); + view = new (PostsBlock.PostsBlockSettingsView)({ model: model }); view.render(); view.$('.mailpoet_posts_display_type').val('titleOnly').change(); }); diff --git a/tests/javascript/newsletter_editor/blocks/social.spec.js b/tests/javascript/newsletter_editor/blocks/social.spec.js index 27444b6105..1cc35dcc4c 100644 --- a/tests/javascript/newsletter_editor/blocks/social.spec.js +++ b/tests/javascript/newsletter_editor/blocks/social.spec.js @@ -125,7 +125,7 @@ define([ }); it('renders', function () { - var view = new (SocialBlock.SocialBlockView)({model: model}); + var view = new (SocialBlock.SocialBlockView)({ model: model }); expect(view.render).to.not.throw(); expect(view.$('.mailpoet_social')).to.have.length(1); }); @@ -156,7 +156,7 @@ define([ } ] }); - view = new (SocialBlock.SocialBlockView)({model: model}); + view = new (SocialBlock.SocialBlockView)({ model: model }); view.render(); }); @@ -212,7 +212,7 @@ define([ }); it('renders', function () { - var view = new (SocialBlock.SocialBlockSettingsView)({model: model}); + var view = new (SocialBlock.SocialBlockSettingsView)({ model: model }); expect(view.render).to.not.throw(); }); @@ -253,7 +253,7 @@ define([ } ] }); - view = new (SocialBlock.SocialBlockSettingsView)({model: model}); + view = new (SocialBlock.SocialBlockSettingsView)({ model: model }); view.render(); }); diff --git a/tests/javascript/newsletter_editor/blocks/spacer.spec.js b/tests/javascript/newsletter_editor/blocks/spacer.spec.js index 1b27793edc..250fed18c1 100644 --- a/tests/javascript/newsletter_editor/blocks/spacer.spec.js +++ b/tests/javascript/newsletter_editor/blocks/spacer.spec.js @@ -84,7 +84,7 @@ define([ global.stubConfig(EditorApplication); global.stubAvailableStyles(EditorApplication); model = new (SpacerBlock.SpacerBlockModel)(); - view = new (SpacerBlock.SpacerBlockView)({model: model}); + view = new (SpacerBlock.SpacerBlockView)({ model: model }); }); it('renders', function () { @@ -129,7 +129,7 @@ define([ beforeEach(function () { global.stubChannel(EditorApplication); - view = new (SpacerBlock.SpacerBlockSettingsView)({model: model}); + view = new (SpacerBlock.SpacerBlockSettingsView)({ model: model }); }); it('renders', function () { @@ -143,7 +143,7 @@ define([ global.stubChannel(EditorApplication); global.stubConfig(EditorApplication); model = new (SpacerBlock.SpacerBlockModel)(); - view = new (SpacerBlock.SpacerBlockSettingsView)({model: model}); + view = new (SpacerBlock.SpacerBlockSettingsView)({ model: model }); view.render(); }); diff --git a/tests/javascript/newsletter_editor/blocks/text.spec.js b/tests/javascript/newsletter_editor/blocks/text.spec.js index e742fe7606..9d2e6e7ede 100644 --- a/tests/javascript/newsletter_editor/blocks/text.spec.js +++ b/tests/javascript/newsletter_editor/blocks/text.spec.js @@ -42,7 +42,7 @@ define([ var view; global.stubConfig(EditorApplication); model = new (TextBlock.TextBlockModel)(); - view = new (TextBlock.TextBlockView)({model: model}); + view = new (TextBlock.TextBlockView)({ model: model }); it('renders', function () { expect(view.render).to.not.throw(); @@ -55,7 +55,7 @@ define([ beforeEach(function () { global.stubConfig(EditorApplication); - view = new (TextBlock.TextBlockView)({model: model}); + view = new (TextBlock.TextBlockView)({ model: model }); view.render(); }); diff --git a/tests/javascript/newsletter_editor/components/communication.spec.js b/tests/javascript/newsletter_editor/components/communication.spec.js index da5dfe3789..b70aadb643 100644 --- a/tests/javascript/newsletter_editor/components/communication.spec.js +++ b/tests/javascript/newsletter_editor/components/communication.spec.js @@ -216,8 +216,8 @@ define([ var deferred = jQuery.Deferred(); deferred.resolve({ data: [ - {post_title: 'title 1'}, - {post_title: 'post title 2'} + { post_title: 'title 1' }, + { post_title: 'post title 2' } ] }); return deferred; @@ -226,7 +226,7 @@ define([ } }); module.getPosts().done(function (posts) { - expect(posts).to.eql([{post_title: 'title 1'}, {post_title: 'post title 2'}]); + expect(posts).to.eql([{ post_title: 'title 1' }, { post_title: 'post title 2' }]); }); }); @@ -287,8 +287,8 @@ define([ var deferred = jQuery.Deferred(); deferred.resolve({ data: [ - {type: 'text', text: 'something'}, - {type: 'text', text: 'something else'} + { type: 'text', text: 'something' }, + { type: 'text', text: 'something else' } ] }); return deferred; @@ -297,7 +297,7 @@ define([ } }); module.getTransformedPosts().done(function (posts) { - expect(posts).to.eql([{type: 'text', text: 'something'}, {type: 'text', text: 'something else'}]); + expect(posts).to.eql([{ type: 'text', text: 'something' }, { type: 'text', text: 'something else' }]); }); }); diff --git a/tests/javascript/newsletter_editor/components/content.spec.js b/tests/javascript/newsletter_editor/components/content.spec.js index 2f9820b956..1d587c274b 100644 --- a/tests/javascript/newsletter_editor/components/content.spec.js +++ b/tests/javascript/newsletter_editor/components/content.spec.js @@ -40,7 +40,7 @@ define([ it('does not include styles and content properties in its JSON', function () { var json = model.toJSON(); - expect(json).to.deep.equal({subject: 'my test subject'}); + expect(json).to.deep.equal({ subject: 'my test subject' }); }); describe('toJSON()', function () { diff --git a/tests/javascript/newsletter_editor/components/save.spec.js b/tests/javascript/newsletter_editor/components/save.spec.js index be55eb4fc6..2e9e6f24d4 100644 --- a/tests/javascript/newsletter_editor/components/save.spec.js +++ b/tests/javascript/newsletter_editor/components/save.spec.js @@ -76,7 +76,7 @@ define([ it('encodes newsletter body in JSON format', function () { var module; - var body = {type: 'testType'}; + var body = { type: 'testType' }; var mock = sinon.mock() .once() .withArgs({ diff --git a/tests/javascript/newsletter_editor/components/styles.spec.js b/tests/javascript/newsletter_editor/components/styles.spec.js index 3f69df701d..7fd4242d94 100644 --- a/tests/javascript/newsletter_editor/components/styles.spec.js +++ b/tests/javascript/newsletter_editor/components/styles.spec.js @@ -24,7 +24,7 @@ define([ }); it('triggers autoSave when changed', function () { - var mock = sinon.mock({ trigger: function () {}}).expects('trigger').once().withExactArgs('autoSave'); + var mock = sinon.mock({ trigger: function () {} }).expects('trigger').once().withExactArgs('autoSave'); EditorApplication.getChannel = function () { return { trigger: mock From 6449b7cccadd5a03cdf317bd1ada7b9de08c4b29 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Tue, 10 Oct 2017 09:29:22 +0000 Subject: [PATCH 10/10] fixed minor issue --- tests/javascript/newsletter_editor/blocks/image.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/javascript/newsletter_editor/blocks/image.spec.js b/tests/javascript/newsletter_editor/blocks/image.spec.js index 95b7febd85..b1e09a8336 100644 --- a/tests/javascript/newsletter_editor/blocks/image.spec.js +++ b/tests/javascript/newsletter_editor/blocks/image.spec.js @@ -218,7 +218,7 @@ define([ expect(model.get('styles.block.textAlign')).to.equal('left'); }); - it.skip('closes the sidepanel after "Done" is clicked', function() { + it.skip('closes the sidepanel after "Done" is clicked', function () { var mock = sinon.mock().once(); global.MailPoet.Modal.cancel = mock; view.$('.mailpoet_done_editing').click();