diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-01-13 13:53:37 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-13 13:53:37 -0500 |
commit | 97558f6a6ec4c53fa69035fb430ead209d9c222d (patch) | |
tree | 6fc57f5b75b15a025348c6e295cea6aedb9e69ae /api/cli_test.go | |
parent | 07bad4d6d518a9012a20fec8309cd625f57c7a8c (diff) | |
download | chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.gz chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.bz2 chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.zip |
PLT-4938 Add app package and move logic over from api package (#4931)
* Add app package and move logic over from api package
* Change app package functions to return errors
* Move non-api tests into app package
* Fix merge
Diffstat (limited to 'api/cli_test.go')
-rw-r--r-- | api/cli_test.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/api/cli_test.go b/api/cli_test.go index ed8f764a3..1f60b02cd 100644 --- a/api/cli_test.go +++ b/api/cli_test.go @@ -7,6 +7,7 @@ import ( "os/exec" "testing" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" ) @@ -108,7 +109,7 @@ func TestCliCreateUserWithoutTeam(t *testing.T) { t.Fatal(err) } - if result := <-Srv.Store.User().GetByEmail(email); result.Err != nil { + if result := <-app.Srv.Store.User().GetByEmail(email); result.Err != nil { t.Fatal() } else { user := result.Data.(*model.User) @@ -132,7 +133,7 @@ func TestCliAssignRole(t *testing.T) { t.Fatal(err) } - if result := <-Srv.Store.User().GetByEmail(th.BasicUser.Email); result.Err != nil { + if result := <-app.Srv.Store.User().GetByEmail(th.BasicUser.Email); result.Err != nil { t.Fatal() } else { user := result.Data.(*model.User) @@ -370,7 +371,7 @@ func TestCliLeaveTeam(t *testing.T) { t.Fatal("profile should not be on team") } - if result := <-Srv.Store.Team().GetTeamsByUserId(th.BasicUser.Id); result.Err != nil { + if result := <-app.Srv.Store.Team().GetTeamsByUserId(th.BasicUser.Id); result.Err != nil { teamMembers := result.Data.([]*model.TeamMember) if len(teamMembers) > 0 { t.Fatal("Shouldn't be in team") |