diff options
Diffstat (limited to 'api/apitestlib.go')
-rw-r--r-- | api/apitestlib.go | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go index 8fb030488..cd54c8e2a 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -6,6 +6,7 @@ package api import ( "time" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" "github.com/mattermost/platform/utils" @@ -28,7 +29,7 @@ type TestHelper struct { } func SetupEnterprise() *TestHelper { - if Srv == nil { + if app.Srv == nil { utils.TranslationsPreInit() utils.LoadConfig("config.json") utils.InitTranslations(utils.Cfg.LocalizationSettings) @@ -36,14 +37,14 @@ func SetupEnterprise() *TestHelper { *utils.Cfg.RateLimitSettings.Enable = false utils.DisableDebugLogForTest() utils.License.Features.SetDefaults() - NewServer() - InitStores() + app.NewServer() + app.InitStores() InitRouter() - StartServer() + app.StartServer() utils.InitHTML() InitApi() utils.EnableDebugLogForTest() - Srv.Store.MarkSystemRanUnitTests() + app.Srv.Store.MarkSystemRanUnitTests() *utils.Cfg.TeamSettings.EnableOpenServer = true } @@ -52,20 +53,20 @@ func SetupEnterprise() *TestHelper { } func Setup() *TestHelper { - if Srv == nil { + if app.Srv == nil { utils.TranslationsPreInit() utils.LoadConfig("config.json") utils.InitTranslations(utils.Cfg.LocalizationSettings) utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 *utils.Cfg.RateLimitSettings.Enable = false utils.DisableDebugLogForTest() - NewServer() - InitStores() + app.NewServer() + app.InitStores() InitRouter() - StartServer() + app.StartServer() InitApi() utils.EnableDebugLogForTest() - Srv.Store.MarkSystemRanUnitTests() + app.Srv.Store.MarkSystemRanUnitTests() *utils.Cfg.TeamSettings.EnableOpenServer = true } @@ -138,7 +139,7 @@ func (me *TestHelper) CreateUser(client *model.Client) *model.User { utils.DisableDebugLogForTest() ruser := client.Must(client.CreateUser(user, "")).Data.(*model.User) ruser.Password = "Password1" - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(ruser.Id)) utils.EnableDebugLogForTest() return ruser } @@ -146,7 +147,7 @@ func (me *TestHelper) CreateUser(client *model.Client) *model.User { func LinkUserToTeam(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - err := JoinUserToTeam(team, user) + err := app.JoinUserToTeam(team, user) if err != nil { l4g.Error(err.Error()) l4g.Close() @@ -161,7 +162,7 @@ func UpdateUserToTeamAdmin(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() tm := &model.TeamMember{TeamId: team.Id, UserId: user.Id, Roles: model.ROLE_TEAM_USER.Id + " " + model.ROLE_TEAM_ADMIN.Id} - if tmr := <-Srv.Store.Team().UpdateMember(tm); tmr.Err != nil { + if tmr := <-app.Srv.Store.Team().UpdateMember(tm); tmr.Err != nil { utils.EnableDebugLogForTest() l4g.Error(tmr.Err.Error()) l4g.Close() @@ -174,10 +175,10 @@ func UpdateUserToTeamAdmin(user *model.User, team *model.Team) { func MakeUserChannelAdmin(user *model.User, channel *model.Channel) { utils.DisableDebugLogForTest() - if cmr := <-Srv.Store.Channel().GetMember(channel.Id, user.Id); cmr.Err == nil { + if cmr := <-app.Srv.Store.Channel().GetMember(channel.Id, user.Id); cmr.Err == nil { cm := cmr.Data.(model.ChannelMember) cm.Roles = "channel_admin channel_user" - if sr := <-Srv.Store.Channel().UpdateMember(&cm); sr.Err != nil { + if sr := <-app.Srv.Store.Channel().UpdateMember(&cm); sr.Err != nil { utils.EnableDebugLogForTest() panic(sr.Err) } @@ -192,10 +193,10 @@ func MakeUserChannelAdmin(user *model.User, channel *model.Channel) { func MakeUserChannelUser(user *model.User, channel *model.Channel) { utils.DisableDebugLogForTest() - if cmr := <-Srv.Store.Channel().GetMember(channel.Id, user.Id); cmr.Err == nil { + if cmr := <-app.Srv.Store.Channel().GetMember(channel.Id, user.Id); cmr.Err == nil { cm := cmr.Data.(model.ChannelMember) cm.Roles = "channel_user" - if sr := <-Srv.Store.Channel().UpdateMember(&cm); sr.Err != nil { + if sr := <-app.Srv.Store.Channel().UpdateMember(&cm); sr.Err != nil { utils.EnableDebugLogForTest() panic(sr.Err) } @@ -264,7 +265,7 @@ func (me *TestHelper) LoginSystemAdmin() { } func TearDown() { - if Srv != nil { - StopServer() + if app.Srv != nil { + app.StopServer() } } |