diff options
Diffstat (limited to 'web-ui/test')
| -rw-r--r-- | web-ui/test/features.js | 1 | ||||
| -rw-r--r-- | web-ui/test/spec/mail_list/ui/mail_items/generic_mail_item.spec.js | 1 | ||||
| -rw-r--r-- | web-ui/test/spec/mail_view/data/mail_builder.spec.js | 10 | ||||
| -rw-r--r-- | web-ui/test/spec/mail_view/ui/mail_view.spec.js | 12 | ||||
| -rw-r--r-- | web-ui/test/spec/mail_view/ui/recipients/recipients_input.spec.js | 6 | ||||
| -rw-r--r-- | web-ui/test/spec/mail_view/ui/recipients/recipients_iterator.spec.js | 4 | ||||
| -rw-r--r-- | web-ui/test/spec/mail_view/ui/reply_box.spec.js | 2 | ||||
| -rw-r--r-- | web-ui/test/spec/mail_view/ui/send_button.spec.js | 6 | ||||
| -rw-r--r-- | web-ui/test/spec/page/router/url_params.spec.js | 5 | ||||
| -rw-r--r-- | web-ui/test/spec/services/model/mail.spec.js | 1 | ||||
| -rw-r--r-- | web-ui/test/spec/tags/data/tags.spec.js | 2 | ||||
| -rw-r--r-- | web-ui/test/spec/tags/ui/tag_list.spec.js | 14 | ||||
| -rw-r--r-- | web-ui/test/spec/tags/ui/tag_shortcut.spec.js | 16 | ||||
| -rw-r--r-- | web-ui/test/spec/user_alerts/ui/user_alerts.spec.js | 6 | ||||
| -rw-r--r-- | web-ui/test/test-main.js | 8 | 
15 files changed, 56 insertions, 38 deletions
| diff --git a/web-ui/test/features.js b/web-ui/test/features.js index be5a62d5..27c47176 100644 --- a/web-ui/test/features.js +++ b/web-ui/test/features.js @@ -1,4 +1,5 @@  define([], function() { +  'use strict';    return {      isEnabled: function(featureName) {        return true; diff --git a/web-ui/test/spec/mail_list/ui/mail_items/generic_mail_item.spec.js b/web-ui/test/spec/mail_list/ui/mail_items/generic_mail_item.spec.js index 6c49c1cf..ecb2b854 100644 --- a/web-ui/test/spec/mail_list/ui/mail_items/generic_mail_item.spec.js +++ b/web-ui/test/spec/mail_list/ui/mail_items/generic_mail_item.spec.js @@ -88,7 +88,6 @@ describeComponent('mail_list/ui/mail_items/generic_mail_item', function () {          });          it('marks the email as read', function () { -          debugger;            var mailReadEvent = spyOnEvent(document, Pixelated.events.mail.read);            var clickEvent = createClickEvent(specialKey); diff --git a/web-ui/test/spec/mail_view/data/mail_builder.spec.js b/web-ui/test/spec/mail_view/data/mail_builder.spec.js index bf17d598..7f69098f 100644 --- a/web-ui/test/spec/mail_view/data/mail_builder.spec.js +++ b/web-ui/test/spec/mail_view/data/mail_builder.spec.js @@ -1,6 +1,6 @@  define(['mail_view/data/mail_builder'], function (mailBuilder) { +  'use strict';    describe('mail builder', function () { -    'use strict';      it('sets ident if passed to constructor', function() {        var mail = mailBuilder.newMail('12345').build(); @@ -15,15 +15,15 @@ define(['mail_view/data/mail_builder'], function (mailBuilder) {      });      it('sets the subject', function() { -      var mail = mailBuilder.newMail().subject("subject").build(); +      var mail = mailBuilder.newMail().subject('subject').build(); -      expect(mail.header.subject).toBe("subject"); +      expect(mail.header.subject).toBe('subject');      });      it('sets the body', function() { -      var mail = mailBuilder.newMail().body("some body text").build(); +      var mail = mailBuilder.newMail().body('some body text').build(); -      expect(mail.body).toBe("some body text"); +      expect(mail.body).toBe('some body text');      });      describe('to field', function() { diff --git a/web-ui/test/spec/mail_view/ui/mail_view.spec.js b/web-ui/test/spec/mail_view/ui/mail_view.spec.js index 48d7bda2..9fed8275 100644 --- a/web-ui/test/spec/mail_view/ui/mail_view.spec.js +++ b/web-ui/test/spec/mail_view/ui/mail_view.spec.js @@ -72,7 +72,7 @@ describeComponent('mail_view/ui/mail_view', function () {      this.component.displayMail({}, testData);      this.component.select('newTagButton').click(); -    var e = creatingEvent("keydown", 27); +    var e = creatingEvent('keydown', 27);      var newTagInputComponent = this.component.select('newTagInput');      var addNewComponent = this.component.select('addNew'); @@ -114,13 +114,13 @@ describeComponent('mail_view/ui/mail_view', function () {    it('assumes that mail is not trusted if its signature contains no_trust from the user', function() {      var email = testData; -    email.security_casing = {imprints: [{seal: {trust: "no_trust", validity: "ultimate"}}]}; +    email.security_casing = {imprints: [{seal: {trust: 'no_trust', validity: 'ultimate'}}]};      expect(this.component.checkSigned(email)).toEqual('signed signature-not-trusted');    });    it('uses validity when trust is not present', function() {      var email = testData; -    email.security_casing = {imprints: [{seal: { validity: "no_trust"}}]}; +    email.security_casing = {imprints: [{seal: { validity: 'no_trust'}}]};      expect(this.component.checkSigned(email)).toEqual('signed signature-not-trusted');    }); @@ -131,8 +131,8 @@ describeComponent('mail_view/ui/mail_view', function () {    });    it('assumes that the mail is not signed if there are no imprints', function() { -    var email = testData -    email.security_casing = {imprints: []} +    var email = testData; +    email.security_casing = {imprints: []};      expect(this.component.checkSigned(email)).toEqual('not-signed');    }); @@ -163,7 +163,7 @@ describeComponent('mail_view/ui/mail_view', function () {    it('creates new tag when pressing Enter key on new tag input', function(){      var tagsUpdateEvent = spyOnEvent(document, Pixelated.events.mail.tags.update);      var tagListRefreshEvent = spyOnEvent(document, Pixelated.events.dispatchers.tags.refreshTagList); -    var e = creatingEvent("keydown", 13); +    var e = creatingEvent('keydown', 13);      this.component.displayMail({}, testData);      this.component.select('newTagButton').click(); diff --git a/web-ui/test/spec/mail_view/ui/recipients/recipients_input.spec.js b/web-ui/test/spec/mail_view/ui/recipients/recipients_input.spec.js index f54781a7..56bb1120 100644 --- a/web-ui/test/spec/mail_view/ui/recipients/recipients_input.spec.js +++ b/web-ui/test/spec/mail_view/ui/recipients/recipients_input.spec.js @@ -1,5 +1,3 @@ -/* global Pixelated */ -  describeComponent('mail_view/ui/recipients/recipients_input',function () {    'use strict'; @@ -40,12 +38,12 @@ describeComponent('mail_view/ui/recipients/recipients_input',function () {          var enterAddressKeyPressEvent = $.Event('keydown', { which: keycode[0] });          spyOn(enterAddressKeyPressEvent, 'preventDefault'); -        this.$node.val('') +        this.$node.val('');          this.$node.trigger(enterAddressKeyPressEvent);          expect(enterAddressKeyPressEvent.preventDefault).toHaveBeenCalled();          enterAddressKeyPressEvent.preventDefault.reset(); -        this.$node.val('anything') +        this.$node.val('anything');          this.$node.trigger(enterAddressKeyPressEvent);          expect(enterAddressKeyPressEvent.preventDefault).toHaveBeenCalled();        }); diff --git a/web-ui/test/spec/mail_view/ui/recipients/recipients_iterator.spec.js b/web-ui/test/spec/mail_view/ui/recipients/recipients_iterator.spec.js index 095689c2..74e5c614 100644 --- a/web-ui/test/spec/mail_view/ui/recipients/recipients_iterator.spec.js +++ b/web-ui/test/spec/mail_view/ui/recipients/recipients_iterator.spec.js @@ -11,7 +11,7 @@ define(['mail_view/ui/recipients/recipients_iterator'], function (RecipientsIter      exitInput;    function createIterator(elements) { -    return recipientsIterator = new RecipientsIterator({ elements: elements, exitInput: exitInput }); +    return new RecipientsIterator({ elements: elements, exitInput: exitInput });    }    function resetMock(m) { @@ -98,4 +98,4 @@ define(['mail_view/ui/recipients/recipients_iterator'], function (RecipientsIter    }); -});
\ No newline at end of file +}); diff --git a/web-ui/test/spec/mail_view/ui/reply_box.spec.js b/web-ui/test/spec/mail_view/ui/reply_box.spec.js index 0f1550c5..fa229506 100644 --- a/web-ui/test/spec/mail_view/ui/reply_box.spec.js +++ b/web-ui/test/spec/mail_view/ui/reply_box.spec.js @@ -37,7 +37,7 @@ describeComponent('mail_view/ui/reply_box', function () {        setupComponent(attrs); -      expect(this.component.attr.recipientValues['to']).toEqual([attrs.mail.header.from]); +      expect(this.component.attr.recipientValues.to).toEqual([attrs.mail.header.from]);      });      it('should have a subject of Re: <original_message>', function() { diff --git a/web-ui/test/spec/mail_view/ui/send_button.spec.js b/web-ui/test/spec/mail_view/ui/send_button.spec.js index 579ce4a3..06f3b003 100644 --- a/web-ui/test/spec/mail_view/ui/send_button.spec.js +++ b/web-ui/test/spec/mail_view/ui/send_button.spec.js @@ -1,5 +1,9 @@ +/* global Pixelated */ +  describeComponent('mail_view/ui/send_button', function () { +  'use strict'; +    describe('send button', function () {      beforeEach(function () {        setupComponent('<button />'); @@ -81,7 +85,7 @@ describeComponent('mail_view/ui/send_button', function () {          var sendMailEvent = spyOnEvent(document, Pixelated.events.ui.mail.send);          spyOn(this.component, 'off'); -        _.times(3, function () { $(document).trigger(Pixelated.events.ui.mail.recipientsUpdated) });; +        _.times(3, function () { $(document).trigger(Pixelated.events.ui.mail.recipientsUpdated); });          expect(sendMailEvent).toHaveBeenTriggeredOn(document);          expect(this.component.off).toHaveBeenCalledWith(document, Pixelated.events.ui.mail.recipientsUpdated); diff --git a/web-ui/test/spec/page/router/url_params.spec.js b/web-ui/test/spec/page/router/url_params.spec.js index a14ba1ba..f05fa8a1 100644 --- a/web-ui/test/spec/page/router/url_params.spec.js +++ b/web-ui/test/spec/page/router/url_params.spec.js @@ -1,4 +1,7 @@ +/* global jasmine */ +  require(['page/router/url_params'], function (urlParams) { +  'use strict';    describe('urlParams', function () { @@ -8,7 +11,7 @@ require(['page/router/url_params'], function (urlParams) {        window.onpopstate = function () {};      }); -    afterEach(function () { +    jasmine.afterEach(function () {        document.location.hash = '';      }); diff --git a/web-ui/test/spec/services/model/mail.spec.js b/web-ui/test/spec/services/model/mail.spec.js index ba91ebde..9b5f71c6 100644 --- a/web-ui/test/spec/services/model/mail.spec.js +++ b/web-ui/test/spec/services/model/mail.spec.js @@ -1,6 +1,7 @@  /*global Pixelated */  require(['services/model/mail'], function (Mail) { +  'use strict';    var testData;    describe('services/model/mail', function () { diff --git a/web-ui/test/spec/tags/data/tags.spec.js b/web-ui/test/spec/tags/data/tags.spec.js index a8b160fd..41821366 100644 --- a/web-ui/test/spec/tags/data/tags.spec.js +++ b/web-ui/test/spec/tags/data/tags.spec.js @@ -1,3 +1,5 @@ +/* global Pixelated */ +  describeComponent('tags/data/tags', function () {    'use strict'; diff --git a/web-ui/test/spec/tags/ui/tag_list.spec.js b/web-ui/test/spec/tags/ui/tag_list.spec.js index 5c33f36e..85cc4509 100644 --- a/web-ui/test/spec/tags/ui/tag_list.spec.js +++ b/web-ui/test/spec/tags/ui/tag_list.spec.js @@ -1,3 +1,7 @@ +/* global _ */ +/* global Pixelated */ +/* global jasmine */ +  describeComponent('tags/ui/tag_list', function () {    'use strict';    var tagsShortcutsContainer; @@ -11,12 +15,12 @@ describeComponent('tags/ui/tag_list', function () {    describe('post initialization', function () {      beforeEach(function () {        setupComponent(); -      tagsShortcutsContainer = $('<ul>', { id: "tags-shortcuts" }); +      tagsShortcutsContainer = $('<ul>', { id: 'tags-shortcuts' });        $('body').append(tagsShortcutsContainer);      }); -    afterEach(function () { -      $('body')[0].removeChild(tagsShortcutsContainer[0]) +    jasmine.afterEach(function () { +      $('body')[0].removeChild(tagsShortcutsContainer[0]);      });      it('should render tags when tagsList:load is received', function () { @@ -83,7 +87,7 @@ describeComponent('tags/ui/tag_list', function () {        var tagList = [tag('tag1', 1, false), tag('tag2', 2, true), tag('tag3', 3, true)];        $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList}); -      var tagList = [tag('tag1', 1, false), tag('tag2', 2, true)]; +      tagList = [tag('tag1', 1, false), tag('tag2', 2, true)];        $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList});        var customTags = _.map(this.component.select('customTagList').find('li'), function (el) { @@ -101,7 +105,7 @@ describeComponent('tags/ui/tag_list', function () {        var tagList = [tag('inbox', 1, true)];        $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList}); -      var tagList = [tag('sent', 1, true)]; +      tagList = [tag('sent', 1, true)];        $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList});        var shortcuts = _.map($('#tags-shortcuts').find('li'), function (el) { diff --git a/web-ui/test/spec/tags/ui/tag_shortcut.spec.js b/web-ui/test/spec/tags/ui/tag_shortcut.spec.js index 862e0d1c..ebc852d0 100644 --- a/web-ui/test/spec/tags/ui/tag_shortcut.spec.js +++ b/web-ui/test/spec/tags/ui/tag_shortcut.spec.js @@ -1,4 +1,8 @@ -describeComponent("tags/ui/tag_shortcut", function () { +/* global jasmine */ +/* global Pixelated */ + +describeComponent('tags/ui/tag_shortcut', function () { +  'use strict';    var parent, shortcut, component, TagShortcut; @@ -6,13 +10,13 @@ describeComponent("tags/ui/tag_shortcut", function () {      TagShortcut = require('tags/ui/tag_shortcut');      component = jasmine.createSpyObj('tagComponent', ['triggerSelect']); -    parent = $("<ul>"); +    parent = $('<ul>');      $('body').append(parent);      shortcut = TagShortcut.appendedTo(parent, { linkTo: { name: 'inbox', counts: { total: 15 }}, trigger: component });    }); -  afterEach(function () { -    $('body')[0].removeChild(parent[0]) +  jasmine.afterEach(function () { +    $('body')[0].removeChild(parent[0]);    });    it('renders the shortcut inside the parent', function () { @@ -24,11 +28,11 @@ describeComponent("tags/ui/tag_shortcut", function () {    it('selects and unselect on tag.select', function () {      $(document).trigger(Pixelated.events.ui.tag.select, { tag: 'inbox'}); -    expect(shortcut.$node).toHaveClass("selected"); +    expect(shortcut.$node).toHaveClass('selected');      $(document).trigger(Pixelated.events.ui.tag.select, { tag: 'sent'}); -    expect(shortcut.$node).not.toHaveClass("selected"); +    expect(shortcut.$node).not.toHaveClass('selected');    });    it('delegates the click to linked tag', function (){ diff --git a/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js b/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js index 42ef581c..04d0e9d4 100644 --- a/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js +++ b/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js @@ -1,3 +1,5 @@ +/* global Pixelated */ +  describeComponent('user_alerts/ui/user_alerts', function () {    'use strict'; @@ -13,9 +15,9 @@ describeComponent('user_alerts/ui/user_alerts', function () {    it('should be emptied and hidden when hide is called', function() {      expect(this.$node).not.toBeHidden(); -    this.component.hide() +    this.component.hide();      expect(this.$node).toBeHidden(); -    expect(this.$node.html()).toEqual('') +    expect(this.$node.html()).toEqual('');    }); diff --git a/web-ui/test/test-main.js b/web-ui/test/test-main.js index fc82e49f..4a77a657 100644 --- a/web-ui/test/test-main.js +++ b/web-ui/test/test-main.js @@ -37,10 +37,10 @@ requirejs.config({    callback: function () {      require(['page/events','test/test_data', 'views/i18n', 'monkey_patching/array', 'views/recipientListFormatter'], function (events, testData, i18n, mp, recipientListFormatter) { -      window['Pixelated'] = window['Pixelated'] || {}; -      window['Pixelated'].events = events; -      window['Pixelated'].testData = testData; -      window['Pixelated'].mockBloodhound = function() { +      window.Pixelated = window.Pixelated || {}; +      window.Pixelated.events = events; +      window.Pixelated.testData = testData; +      window.Pixelated.mockBloodhound = function() {          window.Bloodhound = function() {};          window.Bloodhound.prototype.initialize = function() {};          window.Bloodhound.prototype.ttAdapter = function() {}; | 
