diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-18 15:36:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 15:36:43 -0700 |
| commit | 8e19ba029f889519d93cf272960dce858971106c (patch) | |
| tree | d8f38ac62661fb8578e2b5c3c619fe31ab29f480 /web | |
| parent | 34a87fa8f47b1447b73e3ae56866b654801b3eee (diff) | |
| download | chat-8e19ba029f889519d93cf272960dce858971106c.tar.gz chat-8e19ba029f889519d93cf272960dce858971106c.tar.bz2 chat-8e19ba029f889519d93cf272960dce858971106c.zip | |
Reduce utils.Cfg references (#7650)
* app.UpdateConfig method
* test fix
* another test fix
* the config override option as-was is just error prone, remove it for now
* derp
Diffstat (limited to 'web')
| -rw-r--r-- | web/web_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/web/web_test.go b/web/web_test.go index 23b43ba93..fe2115f83 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -42,11 +42,11 @@ func Setup() *app.App { utils.LoadConfig("config.json") utils.InitTranslations(utils.Cfg.LocalizationSettings) - a := app.New(app.StoreOverride(testStore), app.ConfigOverride(func(cfg *model.Config) { - cfg.ServiceSettings.ListenAddress = new(string) - *cfg.ServiceSettings.ListenAddress = ":0" - })) + a := app.New(app.StoreOverride(testStore)) + prevListenAddress := *a.Config().ServiceSettings.ListenAddress + a.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" }) a.StartServer() + a.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = prevListenAddress }) api4.Init(a, a.Srv.Router, false) api3 := api.Init(a, a.Srv.Router) Init(api3) |