diff --git a/.eslintrc.tests.json b/.eslintrc.tests.json index 73344cca08..e8d48f587c 100644 --- a/.eslintrc.tests.json +++ b/.eslintrc.tests.json @@ -30,7 +30,6 @@ "no-unused-vars": 0, "no-unused-expressions": 0, "no-underscore-dangle": 0, - "quote-props": 0, "no-shadow": 0, "padded-blocks": 0, "vars-on-top": 0, diff --git a/tests/javascript/mochaTestHelper.js b/tests/javascript/mochaTestHelper.js index bb660e09c1..90b63a9dc3 100644 --- a/tests/javascript/mochaTestHelper.js +++ b/tests/javascript/mochaTestHelper.js @@ -80,10 +80,10 @@ global.stubImage = function(defaultWidth, 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/social.spec.js b/tests/javascript/newsletter_editor/blocks/social.spec.js index d8f35426ca..18e1aeaa90 100644 --- a/tests/javascript/newsletter_editor/blocks/social.spec.js +++ b/tests/javascript/newsletter_editor/blocks/social.spec.js @@ -90,15 +90,15 @@ define([ global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication, { socialIconSets: { - 'default': { - 'custom': 'http://www.sott.net/images/icons/big_x.png' + default: { + custom: 'http://www.sott.net/images/icons/big_x.png' }, - 'light': { - 'custom': 'http://content.indiainfoline.com/wc/news/ImageGallery/css/close_32x32.png' + light: { + custom: 'http://content.indiainfoline.com/wc/news/ImageGallery/css/close_32x32.png' } }, socialIcons: { - 'custom': { + custom: { title: 'Custom', linkFieldName: 'Page URL', defaultLink: 'http://example.org' @@ -174,15 +174,15 @@ define([ global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication, { socialIconSets: { - 'default': { - 'custom': 'someimage.png' + default: { + custom: 'someimage.png' }, - 'light': { - 'custom': 'http://content.indiainfoline.com/wc/news/ImageGallery/css/close_32x32.png' + light: { + custom: 'http://content.indiainfoline.com/wc/news/ImageGallery/css/close_32x32.png' } }, socialIcons: { - 'custom': { + custom: { title: 'Custom', linkFieldName: 'Page URL', defaultLink: 'http://example.org' @@ -217,15 +217,15 @@ define([ global.stubChannel(EditorApplication); global.stubAvailableStyles(EditorApplication, { socialIconSets: { - 'default': { - 'custom': 'http://www.sott.net/images/icons/big_x.png' + default: { + custom: 'http://www.sott.net/images/icons/big_x.png' }, - 'light': { - 'custom': 'http://content.indiainfoline.com/wc/news/ImageGallery/css/close_32x32.png' + light: { + custom: 'http://content.indiainfoline.com/wc/news/ImageGallery/css/close_32x32.png' } }, socialIcons: { - 'custom': { + custom: { title: 'Custom', linkFieldName: 'Page URL', defaultLink: 'http://example.org' diff --git a/tests/javascript/newsletter_editor/components/communication.spec.js b/tests/javascript/newsletter_editor/components/communication.spec.js index f17353127a..294530e2d7 100644 --- a/tests/javascript/newsletter_editor/components/communication.spec.js +++ b/tests/javascript/newsletter_editor/components/communication.spec.js @@ -7,14 +7,14 @@ define([ describe('getPostTypes', function() { it('fetches post types from the server', function() { var module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: function() { var deferred = jQuery.Deferred(); deferred.resolve({ data: { - 'post': 'val1', - 'page': 'val2' + post: 'val1', + page: 'val2' } }); return deferred; @@ -31,15 +31,15 @@ define([ var deferred = jQuery.Deferred(), mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred), module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: mock } } }); deferred.resolve({ - 'post': 'val1', - 'page': 'val2' + post: 'val1', + page: 'val2' }); module.getPostTypes(); module.getPostTypes(); @@ -54,15 +54,15 @@ define([ post = function(params) { var deferred = jQuery.Deferred(); deferred.resolve({ - 'category': 'val1', - 'post_tag': 'val2' + category: 'val1', + post_tag: 'val2' }); return deferred; }, module; spy = sinon.spy(post); module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: spy } @@ -75,13 +75,13 @@ define([ it('fetches taxonomies from the server', function() { var module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: function() { var deferred = jQuery.Deferred(); deferred.resolve({ data: { - 'category': 'val1' + category: 'val1' } }); return deferred; @@ -90,7 +90,7 @@ define([ } }); module.getTaxonomies('page').done(function(types) { - expect(types).to.eql({ 'category': 'val1' }); + expect(types).to.eql({ category: 'val1' }); }); }); @@ -98,13 +98,13 @@ define([ var deferred = jQuery.Deferred(), mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred), module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: mock } } }); - deferred.resolve({ 'category': 'val1' }); + deferred.resolve({ category: 'val1' }); module.getTaxonomies('page'); module.getTaxonomies('page'); @@ -123,7 +123,7 @@ define([ var module; spy = sinon.spy(post); module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: spy } @@ -138,14 +138,14 @@ define([ it('fetches terms from the server', function() { var module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: function() { var deferred = jQuery.Deferred(); deferred.resolve({ data: { - 'term1': 'term1val1', - 'term2': 'term2val2' + term1: 'term1val1', + term2: 'term2val2' } }); return deferred; @@ -154,7 +154,7 @@ define([ } }); module.getTerms({ taxonomies: ['category'] }).done(function(types) { - expect(types).to.eql({ 'term1': 'term1val1', 'term2': 'term2val2' }); + expect(types).to.eql({ term1: 'term1val1', term2: 'term2val2' }); }); }); @@ -162,13 +162,13 @@ define([ var deferred = jQuery.Deferred(), mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred), module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: mock } } }); - deferred.resolve({ 'term1': 'term1val1', 'term2': 'term2val2' }); + deferred.resolve({ term1: 'term1val1', term2: 'term2val2' }); module.getTerms({ taxonomies: ['category'] }); module.getTerms({ taxonomies: ['category'] }); @@ -187,7 +187,7 @@ define([ module; spy = sinon.spy(post); module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: spy } @@ -206,7 +206,7 @@ define([ it('fetches posts from the server', function() { var module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: function() { var deferred = jQuery.Deferred(); @@ -230,7 +230,7 @@ define([ var deferred = jQuery.Deferred(), mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred), module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: mock } @@ -258,7 +258,7 @@ define([ module; spy = sinon.spy(post); module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: spy } @@ -277,7 +277,7 @@ define([ it('fetches transformed posts from the server', function() { var module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: function() { var deferred = jQuery.Deferred(); @@ -301,7 +301,7 @@ define([ var deferred = jQuery.Deferred(), mock = sinon.mock({ post: function() {} }).expects('post').once().returns(deferred), module = CommunicationInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: mock } diff --git a/tests/javascript/newsletter_editor/components/save.spec.js b/tests/javascript/newsletter_editor/components/save.spec.js index 7707e97b9e..e335c9782b 100644 --- a/tests/javascript/newsletter_editor/components/save.spec.js +++ b/tests/javascript/newsletter_editor/components/save.spec.js @@ -148,7 +148,7 @@ define([ EditorApplication.getBody = sinon.stub(); var module = SaveInjector({ - 'mailpoet': { + mailpoet: { Ajax: { post: mock }, @@ -162,7 +162,7 @@ define([ trackEvent: function() {} }, 'newsletter_editor/App': EditorApplication, - 'html2canvas': function() { + html2canvas: function() { return { then: function() { return html2canvasMock; } };