Improve jshint configuration

26 files changed, 19 insertions, 78 deletions

diff --git a/web-ui/test/custom_matchers.js b/web-ui/test/custom_matchers.js
index 6643a3c6..b1e06d1f 100644
--- a/web-ui/test/custom_matchers.js
+++ b/web-ui/test/custom_matchers.js
@@ -3,7 +3,7 @@ define([], function() {
   function toBeRenderedInMatcher () {
     return {
       compare: function (mail, node) {
-        var result = {}, subject, tags, from, date, messages = [], notMessages = [];
+        var result = {}, equals = {}, subject, tags, from, date, messages = [], notMessages = [];
 
         subject = node.find('#mail-' + mail.ident + ' .subject-and-tags')[0];
         tags = _.map(node.find('#mail-' + mail.ident + ' .subject-and-tags .tag'), function (tag) { return tag.textContent; });
@@ -11,37 +11,39 @@ define([], function() {
         from = node.find('#mail-' + mail.ident + ' .from');
 
         if (subject && subject.textContent.trim() === mail.header.subject) {
-          result.pass = true;
+          equals.subject = true;
           notMessages.push('not to be rendered with subject ' + mail.header.subject);
         } else {
-          result.pass = false;
+          equals.subject = false;
           messages.push('to be rendered with subject ' + mail.header.subject + ', but was rendered with subject ' + subject.textContent.trim());
         }
 
         if (tags && tags.join(', ') === mail.tags.join(', ')) {
-          result.pass &= true;
+          equals.tags = true;
           notMessages.push('not to be rendered with tags ' + mail.tags.join(', '));
         } else {
-          result.pass |= false;
-          messages.push('to be rendered with tags ' + mail.tags.join(', ') + ', but was rendered with subject ' + tags.join(', '));
+          equals.tags = false;
+          messages.push('to be rendered with tags ' + mail.tags.join(', ') + ', but was rendered with tags ' + tags.join(', '));
         }
 
         if (date && date.text().trim() === mail.header.date.split('T')[0]) {
-          result.pass &= true;
+          equals.date = true;
           notMessages.push('not to be rendered with date ' + mail.header.date.split('T')[0]);
         } else {
-          result.pass |= false;
+          equals.date = false;
           messages.push('to be rendered with date ' + mail.header.date.split('T')[0] + ', but was rendered with date ' + date.text().trim());
         }
 
         if (from && from.text().trim() === mail.header.from) {
-          result.pass &= true;
+          equals.from = true;
           notMessages.push('not to be rendered with from ' + mail.header.from);
         } else {
-          result.pass |= false;
+          equals.from = false;
           messages.push('to be rendered with from ' + mail.header.from + ', but was rendered with from ' + from.text().trim());
         }
 
+        result.pass = equals.subject && equals.tags && equals.date && equals.from;
+
         if (result.pass) {
           result.message = 'Expected mail ' + mail.ident + ' ' + notMessages.join(', ');
         } else {
diff --git a/web-ui/test/spec/dispatchers/left_pane_dispatcher.spec.js b/web-ui/test/spec/dispatchers/left_pane_dispatcher.spec.js
index a8b4946c..d56f7289 100644
--- a/web-ui/test/spec/dispatchers/left_pane_dispatcher.spec.js
+++ b/web-ui/test/spec/dispatchers/left_pane_dispatcher.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 describeComponent('dispatchers/left_pane_dispatcher', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/dispatchers/middle_pane_dispatchers.spec.js b/web-ui/test/spec/dispatchers/middle_pane_dispatchers.spec.js
index 1dfc7c84..997c51f2 100644
--- a/web-ui/test/spec/dispatchers/middle_pane_dispatchers.spec.js
+++ b/web-ui/test/spec/dispatchers/middle_pane_dispatchers.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 describeComponent('dispatchers/middle_pane_dispatcher', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js b/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js
index 89530ac8..4187610e 100644
--- a/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js
+++ b/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js
@@ -1,6 +1,3 @@
-/*global Pixelated */
-/*global jasmine */
-
 describeComponent('dispatchers/right_pane_dispatcher', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/helpers/view_helper.spec.js b/web-ui/test/spec/helpers/view_helper.spec.js
index caaf16cf..806739b9 100644
--- a/web-ui/test/spec/helpers/view_helper.spec.js
+++ b/web-ui/test/spec/helpers/view_helper.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 define(['helpers/view_helper'], function (viewHelper) {
   'use strict';
 
diff --git a/web-ui/test/spec/mail_list/ui/mail_items/mail_item.spec.js b/web-ui/test/spec/mail_list/ui/mail_items/mail_item.spec.js
index 5c965b71..058040c9 100644
--- a/web-ui/test/spec/mail_list/ui/mail_items/mail_item.spec.js
+++ b/web-ui/test/spec/mail_list/ui/mail_items/mail_item.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 describeMixin('mail_list/ui/mail_items/mail_item', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/mail_list/ui/mail_list.spec.js b/web-ui/test/spec/mail_list/ui/mail_list.spec.js
index 1551643d..72f61a39 100644
--- a/web-ui/test/spec/mail_list/ui/mail_list.spec.js
+++ b/web-ui/test/spec/mail_list/ui/mail_list.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 describeComponent('mail_list/ui/mail_list', function () {
   'use strict';
 
@@ -136,7 +134,6 @@ describeComponent('mail_list/ui/mail_list', function () {
     it('should open draft in popstate event if tag is Drafts', function () {
       var openDraftEvent = spyOnEvent(document, Pixelated.events.dispatchers.rightPane.openDraft);
 
-      debugger;
       this.component.$node.trigger(Pixelated.events.mails.available, { mails: mailList, mailIdent: '30', tag: 'drafts' });
 
       expect(openDraftEvent).toHaveBeenTriggeredOnAndWith(document, { ident: '30'});
diff --git a/web-ui/test/spec/mail_view/data/mail_sender.spec.js b/web-ui/test/spec/mail_view/data/mail_sender.spec.js
index 48d46fde..9b6c2828 100644
--- a/web-ui/test/spec/mail_view/data/mail_sender.spec.js
+++ b/web-ui/test/spec/mail_view/data/mail_sender.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 describeComponent('mail_view/data/mail_sender', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/mail_view/ui/compose_box.spec.js b/web-ui/test/spec/mail_view/ui/compose_box.spec.js
index d17d4b17..414bc022 100644
--- a/web-ui/test/spec/mail_view/ui/compose_box.spec.js
+++ b/web-ui/test/spec/mail_view/ui/compose_box.spec.js
@@ -1,6 +1,3 @@
-/*global jasmine */
-/*global Pixelated */
-
 describeComponent('mail_view/ui/compose_box', function () {
   'use strict';
   beforeEach(function () {
diff --git a/web-ui/test/spec/mail_view/ui/forward_box.spec.js b/web-ui/test/spec/mail_view/ui/forward_box.spec.js
index 30b3b064..613baa47 100644
--- a/web-ui/test/spec/mail_view/ui/forward_box.spec.js
+++ b/web-ui/test/spec/mail_view/ui/forward_box.spec.js
@@ -1,6 +1,3 @@
-/*global jasmine */
-/*global Pixelated */
-
 describeComponent('mail_view/ui/forward_box', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/mail_view/ui/mail_actions.spec.js b/web-ui/test/spec/mail_view/ui/mail_actions.spec.js
index 897726b6..580758a0 100644
--- a/web-ui/test/spec/mail_view/ui/mail_actions.spec.js
+++ b/web-ui/test/spec/mail_view/ui/mail_actions.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 describeComponent('mail_view/ui/mail_actions', function () {
   'use strict';
 
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 b84ecfe6..de6fc29d 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
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 describeComponent('mail_view/ui/mail_view', function () {
   'use strict';
 
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 d4fb8faf..6297a5aa 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
@@ -126,18 +126,18 @@ describeComponent('mail_view/ui/recipients/recipients_input',function () {
   describe('on blur', function() {
     it('tokenizes and sanitize recipient email if there is an input val', function() {
       var addressEnteredEvent = spyOnEvent(this.$node, Pixelated.events.ui.recipients.entered);
-      var blurEvent = $.Event('blur'); 
-	  spyOn(blurEvent, 'preventDefault');
+      var blurEvent = $.Event('blur');
+      spyOn(blurEvent, 'preventDefault');
 
-	  this.$node.val('a@b.c, Friend <friend@domain.com>; d@e.f  , , , , , , , ,');
-	  this.$node.trigger(blurEvent);
+      this.$node.val('a@b.c, Friend <friend@domain.com>; d@e.f  , , , , , , , ,');
+      this.$node.trigger(blurEvent);
 
-	  expect(blurEvent.preventDefault).toHaveBeenCalled();
+      expect(blurEvent.preventDefault).toHaveBeenCalled();
       expect(addressEnteredEvent.callCount).toEqual(3);
 
       expect(addressEnteredEvent.calls[0].data).toEqual({name: 'to', address: 'a@b.c'});
       expect(addressEnteredEvent.calls[1].data).toEqual({name: 'to', address: 'Friend <friend@domain.com>'});
       expect(addressEnteredEvent.calls[2].data).toEqual({name: 'to', address: 'd@e.f'});
-    })
+    });
   });
 });
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 c81af683..8adefcd0 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
@@ -1,6 +1,3 @@
-/*global jasmine */
-/*global Pixelated */
-
 describeComponent('mail_view/ui/reply_box', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/mail_view/ui/reply_section.spec.js b/web-ui/test/spec/mail_view/ui/reply_section.spec.js
index 6bd906bc..9cdf7405 100644
--- a/web-ui/test/spec/mail_view/ui/reply_section.spec.js
+++ b/web-ui/test/spec/mail_view/ui/reply_section.spec.js
@@ -1,6 +1,3 @@
-/*global jasmine */
-/*global Pixelated */
-
 describeComponent('mail_view/ui/reply_section', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/mixins/with_mail_edit_base.spec.js b/web-ui/test/spec/mixins/with_mail_edit_base.spec.js
index c76bf31d..8f495399 100644
--- a/web-ui/test/spec/mixins/with_mail_edit_base.spec.js
+++ b/web-ui/test/spec/mixins/with_mail_edit_base.spec.js
@@ -1,8 +1,3 @@
-/*global Pixelated */
-/*global jasmine */
-/*global runs */
-/*global waits */
-
 describeMixin('mixins/with_mail_edit_base', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/page/logout.spec.js b/web-ui/test/spec/page/logout.spec.js
index 9285013a..cf5e3e70 100644
--- a/web-ui/test/spec/page/logout.spec.js
+++ b/web-ui/test/spec/page/logout.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 describeComponent('page/logout', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/page/pane_contract_expand.spec.js b/web-ui/test/spec/page/pane_contract_expand.spec.js
index 61d786eb..4f4ff49b 100644
--- a/web-ui/test/spec/page/pane_contract_expand.spec.js
+++ b/web-ui/test/spec/page/pane_contract_expand.spec.js
@@ -1,6 +1,3 @@
-/*global Pixelated */
-/*global afterEach */
-
 'use strict';
 
 describeComponent('page/pane_contract_expand', function () {
diff --git a/web-ui/test/spec/page/router.spec.js b/web-ui/test/spec/page/router.spec.js
index 129e0dfb..bb7a655b 100644
--- a/web-ui/test/spec/page/router.spec.js
+++ b/web-ui/test/spec/page/router.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-/*global jasmine */
 describeComponent('page/router', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/search/search_trigger.spec.js b/web-ui/test/spec/search/search_trigger.spec.js
index 845bdc7d..6ba47489 100644
--- a/web-ui/test/spec/search/search_trigger.spec.js
+++ b/web-ui/test/spec/search/search_trigger.spec.js
@@ -1,6 +1,3 @@
-/*global jasmine */
-/*global Pixelated */
-
 describeComponent('search/search_trigger', function () {
   'use strict';
   var self;
diff --git a/web-ui/test/spec/services/delete_service.spec.js b/web-ui/test/spec/services/delete_service.spec.js
index d07b36b2..9872a644 100644
--- a/web-ui/test/spec/services/delete_service.spec.js
+++ b/web-ui/test/spec/services/delete_service.spec.js
@@ -1,6 +1,3 @@
-/*global jasmine */
-/*global Pixelated */
-
 describeComponent('services/delete_service', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/services/mail_service.spec.js b/web-ui/test/spec/services/mail_service.spec.js
index 9077969a..778d79da 100644
--- a/web-ui/test/spec/services/mail_service.spec.js
+++ b/web-ui/test/spec/services/mail_service.spec.js
@@ -1,5 +1,3 @@
-/*global jasmine */
-/*global Pixelated */
 'use strict';
 
 describeComponent('services/mail_service', function () {
@@ -43,7 +41,7 @@ describeComponent('services/mail_service', function () {
 
     it('makes the correct request to the backend', function () {
       expect(readRequest.calls.mostRecent().args[0]).toEqual('/mails/read');
-      expect(readRequest.calls.mostRecent().args[1].data).toEqual('{"idents":[1,2]}')
+      expect(readRequest.calls.mostRecent().args[1].data).toEqual('{"idents":[1,2]}');
     });
 
     it('will trigger that a message has been deleted when it is done deleting', function() {
diff --git a/web-ui/test/spec/services/model/mail.spec.js b/web-ui/test/spec/services/model/mail.spec.js
index f9d076f0..9e24a44f 100644
--- a/web-ui/test/spec/services/model/mail.spec.js
+++ b/web-ui/test/spec/services/model/mail.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-
 require(['services/model/mail'], function (Mail) {
   'use strict';
 
diff --git a/web-ui/test/spec/tags/ui/tag.spec.js b/web-ui/test/spec/tags/ui/tag.spec.js
index 36fc83f2..74587bbb 100644
--- a/web-ui/test/spec/tags/ui/tag.spec.js
+++ b/web-ui/test/spec/tags/ui/tag.spec.js
@@ -1,5 +1,3 @@
-/*global Pixelated */
-/*global _ */
 
 describeComponent('tags/ui/tag', 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 78bd84d9..9391a30a 100644
--- a/web-ui/test/spec/tags/ui/tag_list.spec.js
+++ b/web-ui/test/spec/tags/ui/tag_list.spec.js
@@ -1,7 +1,3 @@
-/* global _ */
-/* global Pixelated */
-/* global jasmine */
-
 describeComponent('tags/ui/tag_list', function () {
   'use strict';
   var tagsShortcutsContainer;
diff --git a/web-ui/test/test_data.js b/web-ui/test/test_data.js
index 64ec60a7..f09260c9 100644
--- a/web-ui/test/test_data.js
+++ b/web-ui/test/test_data.js
@@ -1,4 +1,3 @@
-/*global _ */
 'use strict';
 
 define(function() {