diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-23 19:15:47 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-23 17:17:50 -0200 |
| commit | 4d3094149c9ec3044766a688d02f258e90841172 (patch) | |
| tree | 1bea2877e19055d3fe84d9c67c98860b73cc41e2 /spec | |
| parent | 7a2a5dd39c2c38956465e004c824d2fe86ba85c4 (diff) | |
| download | gitlab-ce-4d3094149c9ec3044766a688d02f258e90841172.tar.gz | |
Merge branch 'issue_25887' into 'master'
Do not override incoming webhook channel for mattermost and slack
Closes #25887
See merge request !8270
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/slack_mattermost_notifications_shared_examples.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/slack_mattermost_notifications_shared_examples.rb b/spec/support/slack_mattermost_notifications_shared_examples.rb index 8582aea5fe5..74d9b8c6313 100644 --- a/spec/support/slack_mattermost_notifications_shared_examples.rb +++ b/spec/support/slack_mattermost_notifications_shared_examples.rb @@ -105,7 +105,7 @@ RSpec.shared_examples 'slack or mattermost notifications' do allow(chat_service).to receive(:username).and_return(username) expect(Slack::Notifier).to receive(:new). - with(webhook_url, username: username, channel: chat_service.default_channel). + with(webhook_url, username: username). and_return( double(:slack_service).as_null_object ) |