Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-03-03 19:43:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(drafts): Don't cc the user on reply-all (specs were broken)

Browse source
This commit is contained in:
Ben Gotow 2015-03-10 11:02:46 -07:00
parent e42c649e54
commit 682f7efcdc
2 changed files with 35 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
spec-inbox/stores/draft-store-spec.coffee
View file

@ -6,35 +6,40 @@ DatabaseStore = require '../../src/flux/stores/database-store.coffee'
DraftStore = require '../../src/flux/stores/draft-store.coffee'
_ = require 'underscore-plus'
fakeThread = new Thread
id: 'fake-thread-id'
subject: 'Fake Subject'
fakeMessage1 = new Message
id: 'fake-message-1'
to: [new Contact(email: 'ben@nilas.com'), new Contact(email: 'evan@nilas.com')]
cc: [new Contact(email: 'mg@nilas.com'), NamespaceStore.current().me()]
bcc: [new Contact(email: 'recruiting@nilas.com')]
from: [new Contact(email: 'customer@example.com', name: 'Customer')]
threadId: 'fake-thread-id'
body: 'Fake Message 1'
date: new Date(1415814587)
fakeMessage2 = new Message
id: 'fake-message-2'
to: [new Contact(email: 'customer@example.com')]
from: [new Contact(email: 'ben@nilas.com')]
threadId: 'fake-thread-id'
body: 'Fake Message 2'
date: new Date(1415814587)
fakeMessages =
'fake-message-1': fakeMessage1
'fake-message-2': fakeMessage2
fakeThread = null
fakeMessage1 = null
fakeMessage2 = null
fakeMessages = null
describe "DraftStore", ->
describe "creating drafts", ->
beforeEach ->
fakeThread = new Thread
id: 'fake-thread-id'
subject: 'Fake Subject'
fakeMessage1 = new Message
id: 'fake-message-1'
to: [new Contact(email: 'ben@nilas.com'), new Contact(email: 'evan@nilas.com')]
cc: [new Contact(email: 'mg@nilas.com'), new Contact(email: NamespaceStore.current().me().email)]
bcc: [new Contact(email: 'recruiting@nilas.com')]
from: [new Contact(email: 'customer@example.com', name: 'Customer')]
threadId: 'fake-thread-id'
body: 'Fake Message 1'
date: new Date(1415814587)
fakeMessage2 = new Message
id: 'fake-message-2'
to: [new Contact(email: 'customer@example.com')]
from: [new Contact(email: 'ben@nilas.com')]
threadId: 'fake-thread-id'
body: 'Fake Message 2'
date: new Date(1415814587)
fakeMessages =
'fake-message-1': fakeMessage1
'fake-message-2': fakeMessage2
spyOn(DatabaseStore, 'find').andCallFake (klass, id) ->
return Promise.resolve(fakeThread) if klass is Thread
return Promise.resolve(fakeMessages[id]) if klass is Message
@ -81,8 +86,7 @@ describe "DraftStore", ->
it "should cc everyone who was on the previous message in to or cc", ->
ccEmails = @model.cc.map (cc) -> cc.email
expectedEmails = [].concat(fakeMessage1.to, fakeMessage1.cc).map (cc) -> cc.email
expect(ccEmails.sort()).toEqual(expectedEmails.sort())
expect(ccEmails.sort()).toEqual([ 'ben@nilas.com', 'evan@nilas.com', 'mg@nilas.com'])
it "should not include people who were bcc'd on the previous message", ->
expect(@model.bcc).toEqual([])

5
src/flux/stores/draft-store.coffee
View file

@ -103,11 +103,14 @@ DraftStore = Reflux.createStore
_onComposeReplyAll: (context) ->
@_newMessageWithContext context, (thread, message) ->
excluded = message.from.map (c) -> c.email
excluded.push(NamespaceStore.current().me().email)
replyToMessageId: message.id
quotedMessage: message
to: message.from
cc: [].concat(message.cc, message.to).filter (p) ->
!_.contains([].concat(message.from, [NamespaceStore.current().me()]), p)
!_.contains(excluded, p.email)
_onComposeForward: (context) ->
@_newMessageWithContext context, (thread, message) ->