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

storage: Store addresses as mail.Address for #69

Browse Source
This commit is contained in:
James Hillyerd
2018-03-11 16:56:09 -07:00
parent 487e491d6f
commit 3bc66d2788
9 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/rest/apiv1_controller.go
View File

@@ -36,8 +36,8 @@ func MailboxListV1(w http.ResponseWriter, req *http.Request, ctx *web.Context) (
jmessages[i] = &model.JSONMessageHeaderV1{
Mailbox: name,
ID: msg.ID(),
From: msg.From(),
To: msg.To(),
From: msg.From().String(),
To: stringutil.StringAddressList(msg.To()),
Subject: msg.Subject(),
Date: msg.Date(),
Size: msg.Size(),
@@ -90,8 +90,8 @@ func MailboxShowV1(w http.ResponseWriter, req *http.Request, ctx *web.Context) (
&model.JSONMessageV1{
Mailbox: name,
ID: msg.ID(),
From: msg.From(),
To: msg.To(),
From: msg.From().String(),
To: stringutil.StringAddressList(msg.To()),
Subject: msg.Subject(),
Date: msg.Date(),
Size: msg.Size(),

10
pkg/rest/apiv1_controller_test.go
View File

@@ -67,16 +67,16 @@ func TestRestMailboxList(t *testing.T) {
data1 := &InputMessageData{
Mailbox: "good",
ID: "0001",
From: "from1",
To: []string{"to1"},
From: "<from1@host>",
To: []string{"<to1@host>"},
Subject: "subject 1",
Date: time.Date(2012, 2, 1, 10, 11, 12, 253, time.FixedZone("PST", -800)),
}
data2 := &InputMessageData{
Mailbox: "good",
ID: "0002",
From: "from2",
To: []string{"to1"},
From: "<from2@host>",
To: []string{"<to1@host>"},
Subject: "subject 2",
Date: time.Date(2012, 7, 1, 10, 11, 12, 253, time.FixedZone("PDT", -700)),
}
@@ -171,7 +171,7 @@ func TestRestMessage(t *testing.T) {
data1 := &InputMessageData{
Mailbox: "good",
ID: "0001",
From: "from1",
From: "<from1@host>",
Subject: "subject 1",
Date: time.Date(2012, 2, 1, 10, 11, 12, 253, time.FixedZone("PST", -800)),
Header: mail.Header{

9
pkg/rest/testutils_test.go
View File

@@ -26,10 +26,15 @@ type InputMessageData struct {
}
func (d *InputMessageData) MockMessage() *storage.MockMessage {
from, _ := mail.ParseAddress(d.From)
to := make([]*mail.Address, len(d.To))
for i, a := range d.To {
to[i], _ = mail.ParseAddress(a)
}
msg := &storage.MockMessage{}
msg.On("ID").Return(d.ID)
msg.On("From").Return(d.From)
msg.On("To").Return(d.To)
msg.On("From").Return(from)
msg.On("To").Return(to)
msg.On("Subject").Return(d.Subject)
msg.On("Date").Return(d.Date)
msg.On("Size").Return(d.Size)