From 97558f6a6ec4c53fa69035fb430ead209d9c222d Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 13 Jan 2017 13:53:37 -0500 Subject: 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 --- api/team_test.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'api/team_test.go') diff --git a/api/team_test.go b/api/team_test.go index 7403afd8a..641f7b98d 100644 --- a/api/team_test.go +++ b/api/team_test.go @@ -6,6 +6,7 @@ package api import ( "testing" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" "github.com/mattermost/platform/utils" @@ -25,7 +26,7 @@ func TestCreateTeam(t *testing.T) { user := &model.User{Email: model.NewId() + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) LinkUserToTeam(user, rteam.Data.(*model.Team)) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user.Id)) Client.Login(user.Email, "passwd1") Client.SetTeamId(rteam.Data.(*model.Team).Id) @@ -140,7 +141,7 @@ func TestGetAllTeams(t *testing.T) { user := &model.User{Email: model.NewId() + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) LinkUserToTeam(user, team) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user.Id)) Client.Login(user.Email, "passwd1") Client.SetTeamId(team.Id) @@ -173,7 +174,7 @@ func TestGetAllTeamListings(t *testing.T) { user := &model.User{Email: model.NewId() + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) LinkUserToTeam(user, team) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user.Id)) Client.Login(user.Email, "passwd1") Client.SetTeamId(team.Id) @@ -219,7 +220,7 @@ func TestTeamPermDelete(t *testing.T) { user1 := &model.User{Email: model.NewId() + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) LinkUserToTeam(user1, team) - store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user1.Id)) Client.Login(user1.Email, "passwd1") Client.SetTeamId(team.Id) @@ -263,7 +264,7 @@ func TestInviteMembers(t *testing.T) { user := &model.User{Email: model.NewId() + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) LinkUserToTeam(user, team) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user.Id)) Client.Login(user.Email, "passwd1") Client.SetTeamId(team.Id) @@ -347,12 +348,12 @@ func TestUpdateTeamDisplayName(t *testing.T) { user := &model.User{Email: team.Email, Nickname: "Corey Hulen", Password: "passwd1"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) LinkUserToTeam(user, team) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user.Id)) user2 := &model.User{Email: "success+" + model.NewId() + "@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) LinkUserToTeam(user2, team) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user2.Id)) Client.Login(user2.Email, "passwd1") Client.SetTeamId(team.Id) @@ -413,7 +414,7 @@ func TestGetMyTeam(t *testing.T) { user := model.User{Email: "success+" + model.NewId() + "@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} ruser, _ := Client.CreateUser(&user, "") LinkUserToTeam(ruser.Data.(*model.User), rteam.Data.(*model.Team)) - store.Must(Srv.Store.User().VerifyEmail(ruser.Data.(*model.User).Id)) + store.Must(app.Srv.Store.User().VerifyEmail(ruser.Data.(*model.User).Id)) Client.Login(user.Email, user.Password) Client.SetTeamId(team.Id) @@ -658,7 +659,7 @@ func TestGetTeamStats(t *testing.T) { user := model.User{Email: "success+" + model.NewId() + "@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} ruser, _ := Client.CreateUser(&user, "") - store.Must(Srv.Store.User().VerifyEmail(ruser.Data.(*model.User).Id)) + store.Must(app.Srv.Store.User().VerifyEmail(ruser.Data.(*model.User).Id)) Client.Login(user.Email, user.Password) @@ -678,12 +679,12 @@ func TestUpdateTeamDescription(t *testing.T) { user := &model.User{Email: team.Email, Nickname: "My Testing", Password: "passwd1"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) LinkUserToTeam(user, team) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user.Id)) user2 := &model.User{Email: "success+" + model.NewId() + "@simulator.amazonses.com", Nickname: "Jabba the Hutt", Password: "passwd1"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) LinkUserToTeam(user2, team) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user2.Id)) Client.Login(user2.Email, "passwd1") Client.SetTeamId(team.Id) @@ -721,7 +722,7 @@ func TestGetTeamByName(t *testing.T) { user := &model.User{Email: team.Email, Nickname: "My Testing", Password: "passwd1"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) LinkUserToTeam(user, team) - store.Must(Srv.Store.User().VerifyEmail(user.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user.Id)) Client.Login(user.Email, "passwd1") if _, err := Client.GetTeamByName(team.Name); err != nil { @@ -740,7 +741,7 @@ func TestGetTeamByName(t *testing.T) { user2 := &model.User{Email: "success+" + model.NewId() + "@simulator.amazonses.com", Nickname: "Jabba the Hutt", Password: "passwd1"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(user2.Id)) Client.Login(user2.Email, "passwd1") -- cgit v1.2.3-1-g7c22