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/status_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/status_test.go')
| -rw-r--r-- | api/status_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/api/status_test.go b/api/status_test.go index 5db5a8d7c..34c3320bd 100644 --- a/api/status_test.go +++ b/api/status_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" "github.com/mattermost/platform/utils" @@ -34,12 +35,12 @@ func TestStatuses(t *testing.T) { user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) LinkUserToTeam(ruser, rteam.Data.(*model.Team)) - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(ruser.Id)) user2 := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} ruser2 := Client.Must(Client.CreateUser(&user2, "")).Data.(*model.User) LinkUserToTeam(ruser2, rteam.Data.(*model.Team)) - store.Must(Srv.Store.User().VerifyEmail(ruser2.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(ruser2.Id)) Client.Login(user.Email, user.Password) Client.SetTeamId(team.Id) @@ -137,7 +138,7 @@ func TestStatuses(t *testing.T) { WebSocketClient2.Close() - SetStatusAwayIfNeeded(th.BasicUser.Id, false) + app.SetStatusAwayIfNeeded(th.BasicUser.Id, false) awayTimeout := *utils.Cfg.TeamSettings.UserStatusAwayTimeout defer func() { @@ -147,8 +148,8 @@ func TestStatuses(t *testing.T) { time.Sleep(1500 * time.Millisecond) - SetStatusAwayIfNeeded(th.BasicUser.Id, false) - SetStatusOnline(th.BasicUser.Id, "junk", false) + app.SetStatusAwayIfNeeded(th.BasicUser.Id, false) + app.SetStatusOnline(th.BasicUser.Id, "junk", false) time.Sleep(1500 * time.Millisecond) |