From 46b339d334673b8cd2410fe0a69fb01f42894cf6 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Thu, 28 Jan 2016 11:13:59 -0800 Subject: [PATCH] fix(message-list): Spec fixes, all stubs need accountId --- .../category-picker/spec/category-picker-spec.cjsx | 4 ++-- internal_packages/message-list/lib/message-list.cjsx | 4 ++-- .../message-list/spec/message-item-container-spec.cjsx | 6 +++--- .../message-list/spec/message-item-spec.cjsx | 1 + .../message-list/spec/message-list-spec.cjsx | 7 +++++-- .../message-list/spec/message-toolbar-items-spec.cjsx | 5 +++-- spec/stores/message-store-spec.coffee | 8 ++++---- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/internal_packages/category-picker/spec/category-picker-spec.cjsx b/internal_packages/category-picker/spec/category-picker-spec.cjsx index 20c9e83aa..b74e1d18a 100644 --- a/internal_packages/category-picker/spec/category-picker-spec.cjsx +++ b/internal_packages/category-picker/spec/category-picker-spec.cjsx @@ -53,7 +53,7 @@ describe 'CategoryPicker', -> setupForCreateNew = (orgUnit = "folder") -> setupFor.call(@, orgUnit) - @testThread = new Thread(id: 't1', subject: "fake", accountId: TEST_ACCOUNT_ID) + @testThread = new Thread(id: 't1', subject: "fake", accountId: TEST_ACCOUNT_ID, categories: []) @picker = ReactTestUtils.renderIntoDocument( ) @@ -69,7 +69,7 @@ describe 'CategoryPicker', -> beforeEach -> setupFor.call(@, "folder") - @testThread = new Thread(id: 't1', subject: "fake", accountId: TEST_ACCOUNT_ID) + @testThread = new Thread(id: 't1', subject: "fake", accountId: TEST_ACCOUNT_ID, categories: []) @picker = ReactTestUtils.renderIntoDocument( ) diff --git a/internal_packages/message-list/lib/message-list.cjsx b/internal_packages/message-list/lib/message-list.cjsx index 72aa02b1f..3f2e50635 100755 --- a/internal_packages/message-list/lib/message-list.cjsx +++ b/internal_packages/message-list/lib/message-list.cjsx @@ -183,7 +183,7 @@ class MessageList extends React.Component Actions.composeForward(thread: @state.currentThread) render: => - if not @state.currentThread? + if not @state.currentThread return
wrapClass = classNames @@ -214,7 +214,7 @@ class MessageList extends React.Component _renderSubject: -> - subject = @state.currentThread?.subject + subject = @state.currentThread.subject subject = "(No Subject)" if not subject or subject.length is 0
diff --git a/internal_packages/message-list/spec/message-item-container-spec.cjsx b/internal_packages/message-list/spec/message-item-container-spec.cjsx index aadf634b8..c4762caf3 100644 --- a/internal_packages/message-list/spec/message-item-container-spec.cjsx +++ b/internal_packages/message-list/spec/message-item-container-spec.cjsx @@ -15,10 +15,10 @@ MessageItemContainer = proxyquire '../lib/message-item-container', {InjectedComponent} = require 'nylas-component-kit' -testThread = new Thread(id: "t1") +testThread = new Thread(id: "t1", accountId: TEST_ACCOUNT_ID) testClientId = "local-id" -testMessage = new Message(id: "m1", draft: false, unread: true) -testDraft = new Message(id: "d1", draft: true, unread: true) +testMessage = new Message(id: "m1", draft: false, unread: true, accountId: TEST_ACCOUNT_ID) +testDraft = new Message(id: "d1", draft: true, unread: true, accountId: TEST_ACCOUNT_ID) describe 'MessageItemContainer', -> diff --git a/internal_packages/message-list/spec/message-item-spec.cjsx b/internal_packages/message-list/spec/message-item-spec.cjsx index 551f3df4b..4a5e0ea33 100644 --- a/internal_packages/message-list/spec/message-item-spec.cjsx +++ b/internal_packages/message-list/spec/message-item-spec.cjsx @@ -118,6 +118,7 @@ describe "MessageItem", -> @thread = new Thread id: 'thread-111' + accountId: TEST_ACCOUNT_ID @threadParticipants = [user_1, user_2, user_3, user_4] diff --git a/internal_packages/message-list/spec/message-list-spec.cjsx b/internal_packages/message-list/spec/message-list-spec.cjsx index 4e508dab0..ce918d9d8 100644 --- a/internal_packages/message-list/spec/message-list-spec.cjsx +++ b/internal_packages/message-list/spec/message-list-spec.cjsx @@ -160,7 +160,8 @@ draftMessages = [ test_thread = (new Thread).fromJSON({ "id": "12345" "id" : "thread_12345" - "subject" : "Subject 12345" + "subject" : "Subject 12345", + "account_id" : TEST_ACCOUNT_ID }) describe "MessageList", -> @@ -188,7 +189,7 @@ describe "MessageList", -> MessageStore._items = testMessages MessageStore._expandItemsToDefault() MessageStore.trigger(MessageStore) - @messageList.setState currentThread: test_thread + @messageList.setState(currentThread: test_thread) NylasTestUtils.loadKeymap("keymaps/base") @@ -285,12 +286,14 @@ describe "MessageList", -> @replyToMessage = new Message id: "reply-id", threadId: test_thread.id + accountId : TEST_ACCOUNT_ID date: new Date() @draft = new Message id: "666", draft: true, date: new Date() replyToMessage: @replyToMessage.id + accountId : TEST_ACCOUNT_ID spyOn(@messageList, '_focusDraft') spyOn(@replyToMessage, 'participantsForReplyAll').andCallFake -> diff --git a/internal_packages/message-list/spec/message-toolbar-items-spec.cjsx b/internal_packages/message-list/spec/message-toolbar-items-spec.cjsx index 2de4a214d..748369dea 100644 --- a/internal_packages/message-list/spec/message-toolbar-items-spec.cjsx +++ b/internal_packages/message-list/spec/message-toolbar-items-spec.cjsx @@ -8,12 +8,14 @@ ThreadToggleUnreadButton = require '../lib/thread-toggle-unread-button' test_thread = (new Thread).fromJSON({ "id" : "thread_12345" + "account_id": TEST_ACCOUNT_ID "subject" : "Subject 12345" "starred": false }) test_thread_starred = (new Thread).fromJSON({ "id" : "thread_starred_12345" + "account_id": TEST_ACCOUNT_ID "subject" : "Subject 12345" "starred": true }) @@ -42,7 +44,7 @@ describe "MessageToolbarItem marking as unread", -> markUnreadBtn = null beforeEach -> - thread = new Thread(id: "thread-id-lol-123") + thread = new Thread(id: "thread-id-lol-123", accountId: TEST_ACCOUNT_ID) markUnreadBtn = ReactTestUtils.renderIntoDocument( ) @@ -61,4 +63,3 @@ describe "MessageToolbarItem marking as unread", -> ReactTestUtils.Simulate.click React.findDOMNode(markUnreadBtn).childNodes[0] expect(Actions.popSheet).toHaveBeenCalled() - diff --git a/spec/stores/message-store-spec.coffee b/spec/stores/message-store-spec.coffee index da7037618..1237e50cd 100644 --- a/spec/stores/message-store-spec.coffee +++ b/spec/stores/message-store-spec.coffee @@ -7,10 +7,10 @@ DatabaseStore = require '../../src/flux/stores/database-store' ChangeUnreadTask = require '../../src/flux/tasks/change-unread-task' Actions = require '../../src/flux/actions' -testThread = new Thread(id: '123') -testMessage1 = new Message(id: 'a', body: '123', files: []) -testMessage2 = new Message(id: 'b', body: '123', files: []) -testMessage3 = new Message(id: 'c', body: '123', files: []) +testThread = new Thread(id: '123', accountId: TEST_ACCOUNT_ID) +testMessage1 = new Message(id: 'a', body: '123', files: [], accountId: TEST_ACCOUNT_ID) +testMessage2 = new Message(id: 'b', body: '123', files: [], accountId: TEST_ACCOUNT_ID) +testMessage3 = new Message(id: 'c', body: '123', files: [], accountId: TEST_ACCOUNT_ID) describe "MessageStore", -> describe "when the receiving focus changes from the FocusedContentStore", ->