diff options
| author | Corey Hulen <corey@hulen.com> | 2015-09-23 14:04:08 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-09-23 14:04:08 -0700 |
| commit | d792745f54463772472bec23b0caaae703eaddb3 (patch) | |
| tree | d98c966e0f273c5a6052e3c154bd7d75d091aa27 /api/webhook_test.go | |
| parent | 0170cfe604e6cfb430be0b6181243ca85a9ab27b (diff) | |
| parent | ccf2e6e4e74fc249a094c2c27de675644f1065cb (diff) | |
| download | chat-d792745f54463772472bec23b0caaae703eaddb3.tar.gz chat-d792745f54463772472bec23b0caaae703eaddb3.tar.bz2 chat-d792745f54463772472bec23b0caaae703eaddb3.zip | |
Merge pull request #752 from mattermost/PLT-11-email
PLT-11 Cleaned up config file and added ability to makes changes from the admin console.
Diffstat (limited to 'api/webhook_test.go')
| -rw-r--r-- | api/webhook_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/webhook_test.go b/api/webhook_test.go index fd4c723b7..22883f8ca 100644 --- a/api/webhook_test.go +++ b/api/webhook_test.go @@ -31,7 +31,7 @@ func TestCreateIncomingHook(t *testing.T) { hook := &model.IncomingWebhook{ChannelId: channel1.Id} - if utils.Cfg.ServiceSettings.AllowIncomingWebhooks { + if utils.Cfg.ServiceSettings.EnableIncomingWebhooks { var rhook *model.IncomingWebhook if result, err := Client.CreateIncomingWebhook(hook); err != nil { t.Fatal(err) @@ -89,7 +89,7 @@ func TestListIncomingHooks(t *testing.T) { channel1 := &model.Channel{DisplayName: "Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id} channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel) - if utils.Cfg.ServiceSettings.AllowIncomingWebhooks { + if utils.Cfg.ServiceSettings.EnableIncomingWebhooks { hook1 := &model.IncomingWebhook{ChannelId: channel1.Id} hook1 = Client.Must(Client.CreateIncomingWebhook(hook1)).Data.(*model.IncomingWebhook) @@ -127,7 +127,7 @@ func TestDeleteIncomingHook(t *testing.T) { channel1 := &model.Channel{DisplayName: "Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id} channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel) - if utils.Cfg.ServiceSettings.AllowIncomingWebhooks { + if utils.Cfg.ServiceSettings.EnableIncomingWebhooks { hook := &model.IncomingWebhook{ChannelId: channel1.Id} hook = Client.Must(Client.CreateIncomingWebhook(hook)).Data.(*model.IncomingWebhook) |