diff options
author | Jesús Espino <jespinog@gmail.com> | 2018-09-20 19:07:03 +0200 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2018-09-20 10:07:03 -0700 |
commit | a08df883b4ddb514d53b518f41431ce7efb50d8f (patch) | |
tree | 9e16aeb09188f4aa34b268b77d78e7ebaa5a5978 /api4/team_test.go | |
parent | f1be975d7ab17a7da89ddb3cf6fea2c1b282a89e (diff) | |
download | chat-a08df883b4ddb514d53b518f41431ce7efb50d8f.tar.gz chat-a08df883b4ddb514d53b518f41431ce7efb50d8f.tar.bz2 chat-a08df883b4ddb514d53b518f41431ce7efb50d8f.zip |
Move file backend to its own service (#9435)
* Move file backend to its own service
* Moving utils/inbucket to mailservice package
Diffstat (limited to 'api4/team_test.go')
-rw-r--r-- | api4/team_test.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/api4/team_test.go b/api4/team_test.go index 547b8d4a9..8f1027cc5 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -15,6 +15,7 @@ import ( "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/services/mailservice" "github.com/mattermost/mattermost-server/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -1894,8 +1895,8 @@ func TestInviteUsersToTeam(t *testing.T) { emailList := []string{user1, user2} //Delete all the messages before check the sample email - utils.DeleteMailBox(user1) - utils.DeleteMailBox(user2) + mailservice.DeleteMailBox(user1) + mailservice.DeleteMailBox(user2) enableEmailInvitations := *th.App.Config().ServiceSettings.EnableEmailInvitations restrictCreationToDomains := th.App.Config().TeamSettings.RestrictCreationToDomains @@ -1925,10 +1926,10 @@ func TestInviteUsersToTeam(t *testing.T) { //Check if the email was send to the rigth email address for _, email := range emailList { - var resultsMailbox utils.JSONMessageHeaderInbucket - err := utils.RetryInbucket(5, func() error { + var resultsMailbox mailservice.JSONMessageHeaderInbucket + err := mailservice.RetryInbucket(5, func() error { var err error - resultsMailbox, err = utils.GetMailBox(email) + resultsMailbox, err = mailservice.GetMailBox(email) return err }) if err != nil { @@ -1939,7 +1940,7 @@ func TestInviteUsersToTeam(t *testing.T) { if !strings.ContainsAny(resultsMailbox[len(resultsMailbox)-1].To[0], email) { t.Fatal("Wrong To recipient") } else { - if resultsEmail, err := utils.GetMessageFromMailbox(email, resultsMailbox[len(resultsMailbox)-1].ID); err == nil { + if resultsEmail, err := mailservice.GetMessageFromMailbox(email, resultsMailbox[len(resultsMailbox)-1].ID); err == nil { if resultsEmail.Subject != expectedSubject { t.Log(resultsEmail.Subject) t.Log(expectedSubject) |