Skip to content

Commit

Permalink
Fixing issue where original textproto.Error wasn't properly returned …
Browse files Browse the repository at this point in the history
…from Send()
  • Loading branch information
jordan-wright committed Oct 26, 2017
1 parent 0558c2a commit 28cec6d
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 3 deletions.
5 changes: 2 additions & 3 deletions send.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@ func (f SendFunc) Send(from string, to []string, msg io.WriterTo) error {

// Send sends emails using the given Sender.
func Send(s Sender, msg ...*Message) error {
for i, m := range msg {
for _, m := range msg {
if err := send(s, m); err != nil {
return fmt.Errorf("gomail: could not send email %d: %v", i+1, err)
return err
}
}

return nil
}

Expand Down
25 changes: 25 additions & 0 deletions send_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package gomail
import (
"bytes"
"io"
"net/textproto"
"reflect"
"testing"
)
Expand Down Expand Up @@ -59,6 +60,30 @@ func TestSend(t *testing.T) {
}
}

func TestSendError(t *testing.T) {
expected := &textproto.Error{
Code: 400,
Msg: "Error",
}

s := &mockSendCloser{
mockSender: func(from string, to []string, msg io.WriterTo) error {
return expected
},
}
err := Send(s, getTestMessage())
if err == nil {
t.Errorf("Expected error in Send(): %v", err)
}
if got, ok := err.(*textproto.Error); ok {
if !reflect.DeepEqual(got, expected) {
t.Errorf("Invalid error received in Send(). Expected %v Got %v", expected, got)
}
} else {
t.Errorf("Invalid error type in Send(): %v", err)
}
}

func getTestMessage() *Message {
m := NewMessage()
m.SetHeader("From", testFrom)
Expand Down

0 comments on commit 28cec6d

Please sign in to comment.