diff options
author | Chris <ccbrown112@gmail.com> | 2018-01-17 12:38:37 -0600 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2018-01-17 13:38:37 -0500 |
commit | 4e6cc846a618ecef5c101727bbd03f6674044ab7 (patch) | |
tree | 1fc093b4b338acf34180c93f30a32de50e17d089 /app/webhook_test.go | |
parent | dce061630530c467966378ae3c5adbcf4a09e34f (diff) | |
download | chat-4e6cc846a618ecef5c101727bbd03f6674044ab7.tar.gz chat-4e6cc846a618ecef5c101727bbd03f6674044ab7.tar.bz2 chat-4e6cc846a618ecef5c101727bbd03f6674044ab7.zip |
Finally remove utils.Cfg (#8113)
* finally remove utils.Cfg
* fix compile error
* another test compilation fix
Diffstat (limited to 'app/webhook_test.go')
-rw-r--r-- | app/webhook_test.go | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/app/webhook_test.go b/app/webhook_test.go index 47303ee93..850e74efc 100644 --- a/app/webhook_test.go +++ b/app/webhook_test.go @@ -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}) |