From 1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 6 Sep 2017 17:12:54 -0500 Subject: app type transition (#7167) --- web/web.go | 2 +- web/web_test.go | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'web') diff --git a/web/web.go b/web/web.go index 221e1dc1c..e54ae483d 100644 --- a/web/web.go +++ b/web/web.go @@ -21,7 +21,7 @@ import ( func InitWeb() { l4g.Debug(utils.T("web.init.debug")) - mainrouter := app.Srv.Router + mainrouter := app.Global().Srv.Router if *utils.Cfg.ServiceSettings.WebserverMode != "disabled" { staticDir, _ := utils.FindDir(model.CLIENT_DIR) diff --git a/web/web_test.go b/web/web_test.go index 4ea7cd8ee..bc3e72159 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -20,29 +20,29 @@ var ApiClient *model.Client var URL string func Setup() { - if app.Srv == nil { + if app.Global().Srv == nil { utils.TranslationsPreInit() utils.LoadConfig("config.json") utils.InitTranslations(utils.Cfg.LocalizationSettings) - app.NewServer() - app.InitStores() + app.Global().NewServer() + app.Global().InitStores() api.InitRouter() - app.StartServer() + app.Global().StartServer() api4.InitApi(false) api.InitApi() InitWeb() URL = "http://localhost" + *utils.Cfg.ServiceSettings.ListenAddress ApiClient = model.NewClient(URL) - app.Srv.Store.MarkSystemRanUnitTests() + app.Global().Srv.Store.MarkSystemRanUnitTests() *utils.Cfg.TeamSettings.EnableOpenServer = true } } func TearDown() { - if app.Srv != nil { - app.StopServer() + if app.Global().Srv != nil { + app.Global().StopServer() } } @@ -68,16 +68,16 @@ func TestIncomingWebhook(t *testing.T) { user := &model.User{Email: model.NewId() + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} user = ApiClient.Must(ApiClient.CreateUser(user, "")).Data.(*model.User) - store.Must(app.Srv.Store.User().VerifyEmail(user.Id)) + store.Must(app.Global().Srv.Store.User().VerifyEmail(user.Id)) ApiClient.Login(user.Email, "passwd1") team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} team = ApiClient.Must(ApiClient.CreateTeam(team)).Data.(*model.Team) - app.JoinUserToTeam(team, user, "") + app.Global().JoinUserToTeam(team, user, "") - app.UpdateUserRoles(user.Id, model.ROLE_SYSTEM_ADMIN.Id) + app.Global().UpdateUserRoles(user.Id, model.ROLE_SYSTEM_ADMIN.Id) ApiClient.SetTeamId(team.Id) channel1 := &model.Channel{DisplayName: "Test API Name", Name: "zz" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id} -- cgit v1.2.3-1-g7c22