summaryrefslogtreecommitdiffstats
path: root/web/web_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'web/web_test.go')
-rw-r--r--web/web_test.go33
1 files changed, 15 insertions, 18 deletions
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
}