* finally remove utils.Cfg

* fix compile error

* another test compilation fix
Этот коммит содержится в:
Chris
2018-01-17 12:38:37 -06:00
коммит произвёл Harrison Healey
родитель dce0616305
Коммит 4e6cc846a6
20 изменённых файлов: 157 добавлений и 153 удалений

Просмотреть файл

@@ -17,13 +17,6 @@ func TestCreateIncomingWebhookForChannel(t *testing.T) {
th := Setup().InitBasic()
defer th.TearDown()
enableIncomingHooks := th.App.Config().ServiceSettings.EnableIncomingWebhooks
defer th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableIncomingWebhooks = enableIncomingHooks })
enablePostUsernameOverride := th.App.Config().ServiceSettings.EnablePostUsernameOverride
defer th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnablePostUsernameOverride = enablePostUsernameOverride })
enablePostIconOverride := th.App.Config().ServiceSettings.EnablePostIconOverride
defer th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnablePostIconOverride = enablePostIconOverride })
type TestCase struct {
EnableIncomingHooks bool
EnablePostUsernameOverride bool
@@ -155,13 +148,6 @@ func TestUpdateIncomingWebhook(t *testing.T) {
th := Setup().InitBasic()
defer th.TearDown()
enableIncomingHooks := th.App.Config().ServiceSettings.EnableIncomingWebhooks
defer th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableIncomingWebhooks = enableIncomingHooks })
enablePostUsernameOverride := th.App.Config().ServiceSettings.EnablePostUsernameOverride
defer th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnablePostUsernameOverride = enablePostUsernameOverride })
enablePostIconOverride := th.App.Config().ServiceSettings.EnablePostIconOverride
defer th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnablePostIconOverride = enablePostIconOverride })
type TestCase struct {
EnableIncomingHooks bool
EnablePostUsernameOverride bool
@@ -300,8 +286,6 @@ func TestCreateWebhookPost(t *testing.T) {
th := Setup().InitBasic()
defer th.TearDown()
enableIncomingHooks := th.App.Config().ServiceSettings.EnableIncomingWebhooks
defer th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableIncomingWebhooks = enableIncomingHooks })
th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableIncomingWebhooks = true })
hook, err := th.App.CreateIncomingWebhookForChannel(th.BasicUser.Id, th.BasicChannel, &model.IncomingWebhook{ChannelId: th.BasicChannel.Id})