Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-20 22:23:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(specs): Resolve merge issues in specs

Browse source
This commit is contained in:
Ben Gotow 2015-07-31 12:06:34 -07:00
parent d551fd37f2
commit 31512e8d9a
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal_packages/message-list/spec/message-list-spec.cjsx
View file

@ -225,9 +225,9 @@ describe "MessageList", ->
describe "MessageList with draft", ->
beforeEach ->
MessageStore._items = testMessages.concat draftMessages
MessageStore._thread = test_thread
MessageStore.trigger(MessageStore)
spyOn(@messageList, "_focusDraft")
@messageList.setState(currentThread: test_thread)
it "renders the composer", ->
items = TestUtils.scryRenderedComponentsWithTypeAndProps(@messageList, InjectedComponent, matching: {role:"Composer"})
@ -240,24 +240,24 @@ describe "MessageList", ->
describe "reply type", ->
it "prompts for a reply when there's only one participant", ->
MessageStore._items = [m3, m5]
MessageStore._thread = test_thread
MessageStore.trigger()
@messageList.setState currentThread: test_thread
expect(@messageList._replyType()).toBe "reply"
cs = TestUtils.scryRenderedDOMComponentsWithClass(@messageList, "footer-reply-area")
expect(cs.length).toBe 1
it "prompts for a reply-all when there's more then one participant", ->
MessageStore._items = [m5, m3]
MessageStore._thread = test_thread
MessageStore.trigger()
@messageList.setState currentThread: test_thread
expect(@messageList._replyType()).toBe "reply-all"
cs = TestUtils.scryRenderedDOMComponentsWithClass(@messageList, "footer-reply-area")
expect(cs.length).toBe 1
it "hides the reply type if the last message is a draft", ->
MessageStore._items = [m5, m3, draftMessages[0]]
MessageStore._thread = test_thread
MessageStore.trigger()
@messageList.setState currentThread: test_thread
cs = TestUtils.scryRenderedDOMComponentsWithClass(@messageList, "footer-reply-area")
expect(cs.length).toBe 0
@ -287,8 +287,8 @@ describe "MessageList", ->
{to: [user_3], cc: [] }
MessageStore._items = [@replyToMessage, @draft]
MessageStore._thread = test_thread
MessageStore.trigger()
@messageList.setState(currentThread: test_thread)
@sessionStub =
draft: => @draft
@ -345,8 +345,8 @@ describe "MessageList", ->
describe "when there is not an existing draft at the bottom of the thread", ->
beforeEach ->
MessageStore._items = [m5, m3]
MessageStore._thread = test_thread
MessageStore.trigger()
@messageList.setState(currentThread: test_thread)
it "should fire a composer action based on the reply type", ->
spyOn(Actions, 'composeReplyAll')

2
src/flux/stores/event-store.coffee
View file

@ -41,7 +41,7 @@ class EventStore extends NylasStore
# From Views
@listenTo Actions.RSVPEvent, @_onRSVPEvent
@_refreshCache()
@__refreshCache()
_onRSVPEvent: (calendar_event, RSVPStatus) ->
task = new EventRSVP(calendar_event, RSVPStatus)