From 058d14143c179d9923eea433fc63094f4f9059aa Mon Sep 17 00:00:00 2001 From: NavaL Date: Mon, 11 Jan 2016 16:55:25 +0100 Subject: merging attachment_list ui and data, and making it into a mixin Issue #573 --- .../spec/dispatchers/right_pane_dispatcher.spec.js | 11 ------- .../spec/mail_view/data/attachment_list.spec.js | 35 ---------------------- .../test/spec/mail_view/ui/attachment_list.spec.js | 28 ++++++++--------- web-ui/test/spec/mail_view/ui/draft_box.spec.js | 2 +- web-ui/test/test_data.js | 1 + 5 files changed, 16 insertions(+), 61 deletions(-) delete mode 100644 web-ui/test/spec/mail_view/data/attachment_list.spec.js (limited to 'web-ui/test') 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 89793183..9df1d557 100644 --- a/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js +++ b/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js @@ -15,17 +15,6 @@ describeComponent('dispatchers/right_pane_dispatcher', function () { expect(composeBox.attachTo).toHaveBeenCalled(); }); - it('should trigger reset attachment list on open compose box event', function () { - var composeBox = require('mail_view/ui/compose_box'); - Pixelated.mockBloodhound(); - this.setupComponent(); - var triggerRestAttachment = spyOnEvent(document, Pixelated.events.mail.resetAttachments); - this.component.trigger(document, Pixelated.events.dispatchers.rightPane.openComposeBox); - - expect(triggerRestAttachment).toHaveBeenTriggeredOn(document); - }); - - describe('no message selected', function () { var noMessageSelectedPane; beforeEach(function () { diff --git a/web-ui/test/spec/mail_view/data/attachment_list.spec.js b/web-ui/test/spec/mail_view/data/attachment_list.spec.js deleted file mode 100644 index 45167e33..00000000 --- a/web-ui/test/spec/mail_view/data/attachment_list.spec.js +++ /dev/null @@ -1,35 +0,0 @@ -describeMixin('mail_view/data/attachment_list', function () { - 'use strict'; - - describe('initialization', function() { - beforeEach(function(){ - this.setupComponent(); - }); - - it('should add attachment to the list based on uploadedAttachment event', function () { - var stubAttachment = {attachment_id: 'faked'}; - $(document).trigger(Pixelated.events.mail.appendAttachment, stubAttachment); - expect(this.component.attr.attachments).toEqual([stubAttachment]); - - var anotherStubAttachment = {attachment_id: 'faked 2'}; - $(document).trigger(Pixelated.events.mail.appendAttachment, anotherStubAttachment); - expect(this.component.attr.attachments).toEqual([stubAttachment, anotherStubAttachment]); - }); - - it('should reset attachment list on compose', function () { - this.component.attr.attachments = ['some array']; - $(document).trigger(Pixelated.events.mail.resetAttachments); - - expect(this.component.attr.attachments).toEqual([]); - }); - - it('should reset attachment list and tear down when email sent', function () { - this.component.attr.attachments = ['some array']; - $(document).trigger(Pixelated.events.mail.sent); - - expect(this.component.attr.attachments).toEqual([]); - }); - - }); - -}); diff --git a/web-ui/test/spec/mail_view/ui/attachment_list.spec.js b/web-ui/test/spec/mail_view/ui/attachment_list.spec.js index 8bbc9f1a..ccede0d9 100644 --- a/web-ui/test/spec/mail_view/ui/attachment_list.spec.js +++ b/web-ui/test/spec/mail_view/ui/attachment_list.spec.js @@ -1,4 +1,4 @@ -describeComponent('mail_view/ui/attachment_list', function () { +describeMixin('mail_view/ui/attachment_list', function () { 'use strict'; describe('initialization', function () { @@ -8,9 +8,19 @@ describeComponent('mail_view/ui/attachment_list', function () { ''); }); + it('should add attachment to the list based on uploadedAttachment event', function () { + var stubAttachment = {ident: 'faked'}; + $(document).trigger(Pixelated.events.mail.appendAttachment, stubAttachment); + expect(this.component.attr.attachments).toEqual([stubAttachment]); + + var anotherStubAttachment = {ident: 'faked 2'}; + $(document).trigger(Pixelated.events.mail.appendAttachment, anotherStubAttachment); + expect(this.component.attr.attachments).toEqual([stubAttachment, anotherStubAttachment]); + }); + it('should trigger add attachment event', function () { var triggerUploadAttachment = spyOnEvent(document, Pixelated.events.mail.appendAttachment); - var stubAttachment = {attachment_id: 'faked'}; + var stubAttachment = {ident: 'faked'}; $(document).trigger(Pixelated.events.mail.uploadedAttachment, stubAttachment); @@ -18,7 +28,7 @@ describeComponent('mail_view/ui/attachment_list', function () { }); it('should render attachment list view based on uploadedAttachment event', function () { - var stubAttachment = {attachment_id: 'faked', filename: 'haha.txt', filesize: 4500}; + var stubAttachment = {ident: 'faked', name: 'haha.txt', size: 4500, encoding: 'base64'}; $(document).trigger(Pixelated.events.mail.uploadedAttachment, stubAttachment); @@ -26,18 +36,8 @@ describeComponent('mail_view/ui/attachment_list', function () { expect(this.component.select('attachmentListItem').html()).toEqual(expected_li); }); - it('should tear down when email sent', function () { - var mockTearDown = spyOn(this.Component.prototype, 'resetAll'); - this.setupComponent('
' + - '' + - '
'); - $(document).trigger(Pixelated.events.mail.sent); - - expect(mockTearDown).toHaveBeenCalled(); - }); - xit('should start uploading attachments', function () { - var stubAttachment = {attachment_id: 'faked', filename: 'haha.txt', filesize: 4500}; + var stubAttachment = {ident: 'faked', name: 'haha.txt', size: 4500}; var mockAjax = spyOn($, 'ajax').and.callFake(function (params) {params.success(stubAttachment);}); var uploadedAttachment = spyOnEvent(document, Pixelated.events.mail.uploadedAttachment); var uploading = spyOnEvent(document, Pixelated.events.mail.uploadingAttachment); diff --git a/web-ui/test/spec/mail_view/ui/draft_box.spec.js b/web-ui/test/spec/mail_view/ui/draft_box.spec.js index 96880adf..f095f5e5 100644 --- a/web-ui/test/spec/mail_view/ui/draft_box.spec.js +++ b/web-ui/test/spec/mail_view/ui/draft_box.spec.js @@ -34,7 +34,7 @@ describeComponent('mail_view/ui/draft_box', function () { expect(this.component.render).toHaveBeenCalledWith(templates.compose.box, { recipients: { to: mail.header.to, cc: mail.header.cc, bcc: mail.header.bcc }, - subject: mail.header.subject, + subject: mail.header.subject, attachments: [], body: mail.textPlainBody }); }); diff --git a/web-ui/test/test_data.js b/web-ui/test/test_data.js index ea9458dc..e9388c2f 100644 --- a/web-ui/test/test_data.js +++ b/web-ui/test/test_data.js @@ -132,6 +132,7 @@ define(function() { tags:['textplain'], mailbox: ['inbox'], status:[], + attachments: [], textPlainBody: 'Hello Everyone', isSentMail: function() { return false; }, isDraftMail: function() { return false; }, -- cgit v1.2.3