diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-12 09:19:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-12 09:19:52 -0500 |
commit | b066b6df138e88e75cb40f1ec3e58fbd13e61909 (patch) | |
tree | 7ee0e8c935cd3bbafd15d0d07d8900af8b82a4e0 /api/apitestlib.go | |
parent | 674a606bd00b276d0a05b3b29a3d5f5e5e7f8206 (diff) | |
download | chat-b066b6df138e88e75cb40f1ec3e58fbd13e61909.tar.gz chat-b066b6df138e88e75cb40f1ec3e58fbd13e61909.tar.bz2 chat-b066b6df138e88e75cb40f1ec3e58fbd13e61909.zip |
Remove global app references (#7433)
* remove global app references
* test fix
* fix api4 test compilation
Diffstat (limited to 'api/apitestlib.go')
-rw-r--r-- | api/apitestlib.go | 62 |
1 files changed, 24 insertions, 38 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go index 71a1f59c2..3f63f3ffc 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -33,35 +33,12 @@ type TestHelper struct { SystemAdminChannel *model.Channel } -func SetupEnterprise() *TestHelper { - if app.Global().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() - utils.License().Features.SetDefaults() - app.Global().NewServer() - app.Global().InitStores() - InitRouter() - wsapi.InitRouter() - app.Global().StartServer() - utils.InitHTML() - api4.InitApi(false) - InitApi() - wsapi.InitApi() - utils.EnableDebugLogForTest() - app.Global().Srv.Store.MarkSystemRanUnitTests() - - *utils.Cfg.TeamSettings.EnableOpenServer = true +func setupTestHelper(enterprise bool) *TestHelper { + th := &TestHelper{ + App: app.Global(), } - return &TestHelper{} -} - -func Setup() *TestHelper { - if app.Global().Srv == nil { + if th.App.Srv == nil { utils.TranslationsPreInit() utils.LoadConfig("config.json") utils.InitTranslations(utils.Cfg.LocalizationSettings) @@ -69,21 +46,32 @@ func Setup() *TestHelper { *utils.Cfg.RateLimitSettings.Enable = false utils.Cfg.EmailSettings.SendEmailNotifications = true utils.DisableDebugLogForTest() - app.Global().NewServer() - app.Global().InitStores() - InitRouter() + if enterprise { + utils.License().Features.SetDefaults() + } + th.App.NewServer() + th.App.InitStores() + th.App.Srv.Router = NewRouter() wsapi.InitRouter() - app.Global().StartServer() - api4.InitApi(false) - InitApi() + th.App.StartServer() + api4.InitApi(th.App.Srv.Router, false) + InitApi(th.App.Srv.Router) wsapi.InitApi() utils.EnableDebugLogForTest() - app.Global().Srv.Store.MarkSystemRanUnitTests() + th.App.Srv.Store.MarkSystemRanUnitTests() *utils.Cfg.TeamSettings.EnableOpenServer = true } - return &TestHelper{} + return th +} + +func SetupEnterprise() *TestHelper { + return setupTestHelper(true) +} + +func Setup() *TestHelper { + return setupTestHelper(false) } func ReloadConfigForSetup() { @@ -96,7 +84,6 @@ func ReloadConfigForSetup() { } func (me *TestHelper) InitBasic() *TestHelper { - me.App = app.Global() me.BasicClient = me.CreateClient() me.BasicUser = me.CreateUser(me.BasicClient) me.LoginBasic() @@ -116,7 +103,6 @@ func (me *TestHelper) InitBasic() *TestHelper { } func (me *TestHelper) InitSystemAdmin() *TestHelper { - me.App = app.Global() me.SystemAdminClient = me.CreateClient() me.SystemAdminUser = me.CreateUser(me.SystemAdminClient) me.SystemAdminUser.Password = "Password1" @@ -166,7 +152,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(app.Global().Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(me.App.Srv.Store.User().VerifyEmail(ruser.Id)) utils.EnableDebugLogForTest() return ruser } |