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 /web/web_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 'web/web_test.go')
| -rw-r--r-- | web/web_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/web_test.go b/web/web_test.go index 1cb1c0a34..165c2ba09 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -25,7 +25,7 @@ func Setup() { api.StartServer() api.InitApi() InitWeb() - URL = "http://localhost:" + utils.Cfg.ServiceSettings.Port + URL = "http://localhost" + utils.Cfg.ServiceSettings.ListenAddress ApiClient = model.NewClient(URL) } } @@ -195,7 +195,7 @@ func TestIncomingWebhook(t *testing.T) { channel1 := &model.Channel{DisplayName: "Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id} channel1 = ApiClient.Must(ApiClient.CreateChannel(channel1)).Data.(*model.Channel) - if utils.Cfg.ServiceSettings.AllowIncomingWebhooks { + if utils.Cfg.ServiceSettings.EnableIncomingWebhooks { hook1 := &model.IncomingWebhook{ChannelId: channel1.Id} hook1 = ApiClient.Must(ApiClient.CreateIncomingWebhook(hook1)).Data.(*model.IncomingWebhook) |