diff options
author | Martin Kraft <mkraft@users.noreply.github.com> | 2018-02-12 12:49:29 -0500 |
---|---|---|
committer | Jesús Espino <jespinog@gmail.com> | 2018-02-12 18:49:29 +0100 |
commit | 93254308599357fac665fce604f3506ee8a845fa (patch) | |
tree | 7a509e936f68cca920629f80ef73969cb1bc5211 | |
parent | 1edcabbc9bd2e571dd72a2df699bc2979274add2 (diff) | |
download | chat-93254308599357fac665fce604f3506ee8a845fa.tar.gz chat-93254308599357fac665fce604f3506ee8a845fa.tar.bz2 chat-93254308599357fac665fce604f3506ee8a845fa.zip |
XYZ-73: Removes EnableOnlyAdminIntegrations uses. (#8245)
-rw-r--r-- | api/command_test.go | 3 | ||||
-rw-r--r-- | api4/post_test.go | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/api/command_test.go b/api/command_test.go index 7eadca124..7f9c6dcff 100644 --- a/api/command_test.go +++ b/api/command_test.go @@ -202,13 +202,10 @@ func TestDeleteCommand(t *testing.T) { Client := th.SystemAdminClient enableCommands := *th.App.Config().ServiceSettings.EnableCommands - onlyAdminIntegration := *th.App.Config().ServiceSettings.EnableOnlyAdminIntegrations defer func() { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableCommands = enableCommands }) - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableOnlyAdminIntegrations = onlyAdminIntegration }) }() th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableCommands = true }) - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableOnlyAdminIntegrations = false }) cmd := &model.Command{URL: "http://nowhere.com", Method: model.COMMAND_METHOD_POST, Trigger: "trigger"} cmd = Client.Must(Client.CreateCommand(cmd)).Data.(*model.Command) diff --git a/api4/post_test.go b/api4/post_test.go index 52326c4b0..dba3a1c2d 100644 --- a/api4/post_test.go +++ b/api4/post_test.go @@ -131,17 +131,14 @@ func testCreatePostWithOutgoingHook( channel := th.BasicChannel enableOutgoingHooks := th.App.Config().ServiceSettings.EnableOutgoingWebhooks - enableAdminOnlyHooks := th.App.Config().ServiceSettings.EnableOnlyAdminIntegrations allowedInternalConnections := *th.App.Config().ServiceSettings.AllowedUntrustedInternalConnections defer func() { th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableOutgoingWebhooks = enableOutgoingHooks }) - th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableOnlyAdminIntegrations = enableAdminOnlyHooks }) th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.AllowedUntrustedInternalConnections = &allowedInternalConnections }) }() th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableOutgoingWebhooks = true }) - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableOnlyAdminIntegrations = true }) th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.AllowedUntrustedInternalConnections = "localhost 127.0.0.1" }) |