Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 17:47:03 +00:00
Code Issues Releases Wiki Activity

storage: Move NewMessage() into Store interface for #69

Browse Source
This commit is contained in:
James Hillyerd
2018-03-11 10:48:50 -07:00
parent d9b5e40c87
commit 137466f89b
7 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/smtp/handler.go
View File

@@ -451,7 +451,7 @@ func (ss *Session) dataHandler() {
// deliverMessage creates and populates a new Message for the specified recipient
func (ss *Session) deliverMessage(r recipientDetails, msgBuf [][]byte) (ok bool) {
msg, err := r.mailbox.NewMessage()
msg, err := ss.server.dataStore.NewMessage(r.localPart)
if err != nil {
ss.logError("Failed to create message for %q: %s", r.localPart, err)
return false

4
pkg/server/smtp/handler_test.go
View File

@@ -148,7 +148,7 @@ func TestMailState(t *testing.T) {
mb1 := &storage.MockMailbox{}
msg1 := &storage.MockMessage{}
mds.On("MailboxFor", "u1").Return(mb1, nil)
mb1.On("NewMessage").Return(msg1, nil)
mds.On("NewMessage", "u1").Return(msg1, nil)
mb1.On("Name").Return("u1")
msg1.On("ID").Return("")
msg1.On("From").Return("")
@@ -263,7 +263,7 @@ func TestDataState(t *testing.T) {
mb1 := &storage.MockMailbox{}
msg1 := &storage.MockMessage{}
mds.On("MailboxFor", "u1").Return(mb1, nil)
mb1.On("NewMessage").Return(msg1, nil)
mds.On("NewMessage", "u1").Return(msg1, nil)
mb1.On("Name").Return("u1")
msg1.On("ID").Return("")
msg1.On("From").Return("")