Skip to content

Commit

Permalink
Merge pull request #54 from pivotal-cf/develop
Browse files Browse the repository at this point in the history
update to v3.3.4 of mailyak to address issue https://github.com/pivot…
  • Loading branch information
Caleb Washburn authored Nov 8, 2022
2 parents 91a96e5 + 5f17f39 commit f882988
Show file tree
Hide file tree
Showing 24 changed files with 652 additions and 223 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.17

require (
bitbucket.org/chrj/smtpd v0.0.0-20170817182725-9ddcdbda0f7a
github.com/domodwyer/mailyak v3.1.1+incompatible
github.com/domodwyer/mailyak/v3 v3.3.4
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.19.0
github.com/pkg/errors v0.8.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/domodwyer/mailyak v3.1.1+incompatible h1:oPtXn3+56LEFbdqH0bpuPRsqtijW9l2POpQe9sTUsSI=
github.com/domodwyer/mailyak v3.1.1+incompatible/go.mod h1:5NNYkn9hxcdNEOmmMx0yultN5VLorZQ+AWQo9iya+UY=
github.com/domodwyer/mailyak/v3 v3.3.4 h1:AG/pvcz2/ocFqZkPEG7lPAa0MhCq1warfUEKJt6Fagk=
github.com/domodwyer/mailyak/v3 v3.3.4/go.mod h1:lOm/u9CyCVWHeaAmHIdF4RiKVxKUT/H5XX10lIKAL6c=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
Expand Down
10 changes: 5 additions & 5 deletions out/fakes/fake_mail.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion out/mail.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"

"github.com/domodwyer/mailyak"
"github.com/domodwyer/mailyak/v3"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion out/mail_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package out_test
import (
"bytes"

"github.com/domodwyer/mailyak"
"github.com/domodwyer/mailyak/v3"
"github.com/pivotal-cf/email-resource/out"
"github.com/pivotal-cf/email-resource/out/fakes"

Expand Down
5 changes: 1 addition & 4 deletions out/out_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,7 @@ even empty lines
delivery := smtpServer.Deliveries[0]
Expect(delivery.Sender).To(Equal("[email protected]"))
Expect(delivery.Recipients).To(Equal([]string{"[email protected]", "[email protected]", "[email protected]"}))

Expect(string(delivery.Data)).To(ContainSubstring("To: [email protected]"))
Expect(string(delivery.Data)).To(ContainSubstring("To: [email protected]"))
Expect(string(delivery.Data)).To(ContainSubstring("To: [email protected]"))
Expect(string(delivery.Data)).To(ContainSubstring("To: [email protected],[email protected],[email protected]"))
Expect(string(delivery.Data)).To(ContainSubstring("some subject line"))
Expect(string(delivery.Data)).To(ContainSubstring(`this is a body
it has many lines
Expand Down
137 changes: 0 additions & 137 deletions vendor/github.com/domodwyer/mailyak/mailyak.go

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 64 additions & 0 deletions vendor/github.com/domodwyer/mailyak/v3/.golangci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 52 additions & 0 deletions vendor/github.com/domodwyer/mailyak/v3/.pre-commit-config.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
Loading

0 comments on commit f882988

Please sign in to comment.