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
Этот коммит содержится в:
@@ -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.BasicClient
|
||||
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.Must(Client.Command(channel.Id, "/help ")).Data.(*model.CommandResponse)
|
||||
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.Must(Client.Command(channel.Id, "/help ")).Data.(*model.CommandResponse)
|
||||
if rs2.GotoLocation != "https://docs.mattermost.com/guides/user.html" {
|
||||
t.Fatal("failed to help link")
|
||||
|
||||
Ссылка в новой задаче
Block a user