diff options
Diffstat (limited to 'web-ui/test/spec/tags/ui')
-rw-r--r-- | web-ui/test/spec/tags/ui/tag.spec.js | 12 | ||||
-rw-r--r-- | web-ui/test/spec/tags/ui/tag_list.spec.js | 4 | ||||
-rw-r--r-- | web-ui/test/spec/tags/ui/tag_shortcut.spec.js | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/web-ui/test/spec/tags/ui/tag.spec.js b/web-ui/test/spec/tags/ui/tag.spec.js index 48f761da..1f76ebe3 100644 --- a/web-ui/test/spec/tags/ui/tag.spec.js +++ b/web-ui/test/spec/tags/ui/tag.spec.js @@ -6,7 +6,7 @@ describeComponent('tags/ui/tag', function () { describe('inbox tag', function () { beforeEach(function () { - setupComponent('<li></li>', { + this.setupComponent('<li></li>', { tag: { name: 'inbox', ident: '1', @@ -48,7 +48,7 @@ describeComponent('tags/ui/tag', function () { describe('increasing count read when email is read', function () { it('doesnt update if mail.tags or mail.mailbox dont match the tag name', function () { - setupComponent('<li></li>', { + this.setupComponent('<li></li>', { tag: { name: 'sometag', ident: '1', counts: { total: 100, read: 0 } } }); @@ -65,7 +65,7 @@ describeComponent('tags/ui/tag', function () { }); it('looks at the mail tags for non default tags', function () { - setupComponent('<li></li>', { + this.setupComponent('<li></li>', { tag: { name: 'tag', ident: '1', counts: { total: 100, read: 0 } } }); @@ -101,7 +101,7 @@ describeComponent('tags/ui/tag', function () { describe('drafts tag', function () { var containerFordrafts; beforeEach(function () { - setupComponent('<li></li>', { + this.setupComponent('<li></li>', { tag: { name: 'drafts', ident: '42', @@ -122,7 +122,7 @@ describeComponent('tags/ui/tag', function () { describe('all tag', function () { beforeEach(function () { - setupComponent('<li></li>', { + this.setupComponent('<li></li>', { tag: { name: 'all', ident: '45', @@ -156,7 +156,7 @@ describeComponent('tags/ui/tag', function () { _.each(['sent', 'trash'], function (tag_name) { describe(tag_name + ' tag', function () { beforeEach(function () { - setupComponent('<li></li>', { + this.setupComponent('<li></li>', { tag: { name: tag_name, ident: '42', 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 c79bed53..72667b40 100644 --- a/web-ui/test/spec/tags/ui/tag_list.spec.js +++ b/web-ui/test/spec/tags/ui/tag_list.spec.js @@ -14,7 +14,7 @@ describeComponent('tags/ui/tag_list', function () { describe('post initialization', function () { beforeEach(function () { - setupComponent(); + this.setupComponent(); tagsShortcutsContainer = $('<ul>', { id: 'tags-shortcuts' }); $('body').append(tagsShortcutsContainer); }); @@ -74,7 +74,7 @@ describeComponent('tags/ui/tag_list', function () { $(document).trigger(Pixelated.events.ui.tagList.load, {tags: [] }); - expect(tagsLoadedEvent).toHaveBeenTriggeredOnAndWith(document, { tag: undefined }); + expect(tagsLoadedEvent).toHaveBeenTriggeredOnAndWith(document, jasmine.objectContaining({ tag: undefined })); }); it('should save the current tag when a tag is selected', function () { 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 9164507a..7f015319 100644 --- a/web-ui/test/spec/tags/ui/tag_shortcut.spec.js +++ b/web-ui/test/spec/tags/ui/tag_shortcut.spec.js @@ -46,8 +46,8 @@ describeComponent('tags/ui/tag_shortcut', function () { var shortcutAddedAfterEmptyingParent = TagShortcut.appendedTo(parent, { linkTo: { name: 'inbox', counts: { total: 15 }}, trigger: component }); // by now shorcut is not in the DOM anymore but shortcutAddedAfterEmptyingParent is - spyOn(shortcut, 'teardown').andCallThrough(); - spyOn(shortcutAddedAfterEmptyingParent, 'teardown').andCallThrough(); + spyOn(shortcut, 'teardown').and.callThrough(); + spyOn(shortcutAddedAfterEmptyingParent, 'teardown').and.callThrough(); $(document).trigger(Pixelated.events.tags.shortcuts.teardown); |