From bff2b5e735ae7fc80157b4108ddbe56be8acb752 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 9 Oct 2017 14:59:48 -0700 Subject: Miscellaneous app cleanup (#7594) * app cleanup * whoops, forgot a file * some minor cleanup * longer container deadline * defensive checks --- web/web_test.go | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'web/web_test.go') diff --git a/web/web_test.go b/web/web_test.go index f4e231b30..6cc75fac1 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -18,25 +18,22 @@ var ApiClient *model.Client var URL string func Setup() *app.App { + utils.TranslationsPreInit() + utils.LoadConfig("config.json") + utils.InitTranslations(utils.Cfg.LocalizationSettings) + a := app.New() - if a.Srv == nil { - utils.TranslationsPreInit() - utils.LoadConfig("config.json") - utils.InitTranslations(utils.Cfg.LocalizationSettings) - a.NewServer() - a.InitStores() - a.Srv.Router = api.NewRouter() - a.StartServer() - api4.Init(a, a.Srv.Router, false) - api3 := api.Init(a, a.Srv.Router) - Init(api3) - URL = "http://localhost" + *utils.Cfg.ServiceSettings.ListenAddress - ApiClient = model.NewClient(URL) - - a.Srv.Store.MarkSystemRanUnitTests() - - *utils.Cfg.TeamSettings.EnableOpenServer = true - } + a.StartServer() + api4.Init(a, a.Srv.Router, false) + api3 := api.Init(a, a.Srv.Router) + Init(api3) + URL = "http://localhost" + *utils.Cfg.ServiceSettings.ListenAddress + ApiClient = model.NewClient(URL) + + a.Srv.Store.MarkSystemRanUnitTests() + + *utils.Cfg.TeamSettings.EnableOpenServer = true + return a } -- cgit v1.2.3-1-g7c22