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 /api4/command_help_test.go | |
| 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 'api4/command_help_test.go')
| -rw-r--r-- | api4/command_help_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/api4/command_help_test.go b/api4/command_help_test.go index 68a098636..c5ff819b3 100644 --- a/api4/command_help_test.go +++ b/api4/command_help_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func TestHelpCommand(t *testing.T) { @@ -17,18 +16,20 @@ func TestHelpCommand(t *testing.T) { Client := th.Client channel := th.BasicChannel - HelpLink := *utils.Cfg.SupportSettings.HelpLink + HelpLink := *th.App.Config().SupportSettings.HelpLink defer func() { - *utils.Cfg.SupportSettings.HelpLink = HelpLink + th.App.UpdateConfig(func(cfg *model.Config) { *cfg.SupportSettings.HelpLink = HelpLink }) }() - *utils.Cfg.SupportSettings.HelpLink = "" + th.App.UpdateConfig(func(cfg *model.Config) { *cfg.SupportSettings.HelpLink = "" }) rs1, _ := Client.ExecuteCommand(channel.Id, "/help ") if rs1.GotoLocation != model.SUPPORT_SETTINGS_DEFAULT_HELP_LINK { t.Fatal("failed to default help link") } - *utils.Cfg.SupportSettings.HelpLink = "https://docs.mattermost.com/guides/user.html" + th.App.UpdateConfig(func(cfg *model.Config) { + *cfg.SupportSettings.HelpLink = "https://docs.mattermost.com/guides/user.html" + }) rs2, _ := Client.ExecuteCommand(channel.Id, "/help ") if rs2.GotoLocation != "https://docs.mattermost.com/guides/user.html" { t.Fatal("failed to help link") |