diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-23 08:16:48 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-23 13:35:20 +0100 |
| commit | 091c2608129445c6fe2dbe9a59e5fd3c78103d94 (patch) | |
| tree | 047e20308c620e1c2d0a1955f490d3394aeec502 /spec | |
| parent | fed319b4ab763790865835eca35d179294883dd2 (diff) | |
| download | gitlab-ce-091c2608129445c6fe2dbe9a59e5fd3c78103d94.tar.gz | |
Improve readability and add test
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/admin/admin_settings_spec.rb | 1 | ||||
| -rw-r--r-- | spec/support/slack_mattermost_notifications_shared_examples.rb | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 03daab12c8f..5099441dce2 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -34,6 +34,7 @@ feature 'Admin updates settings', feature: true do fill_in 'Username', with: 'test_user' fill_in 'service_push_channel', with: '#test_channel' page.check('Notify only broken pipelines') + page.check('Notify only default branch') check_all_events click_on 'Save' diff --git a/spec/support/slack_mattermost_notifications_shared_examples.rb b/spec/support/slack_mattermost_notifications_shared_examples.rb index 704922b6cf4..b902fe90707 100644 --- a/spec/support/slack_mattermost_notifications_shared_examples.rb +++ b/spec/support/slack_mattermost_notifications_shared_examples.rb @@ -324,5 +324,24 @@ RSpec.shared_examples 'slack or mattermost notifications' do it_behaves_like 'call Slack/Mattermost API' end end + + context 'only notify for the default branch' do + context 'when enabled' do + let(:pipeline) do + create(:ci_pipeline, project: project, status: 'failed', ref: 'not-the-default-branch') + end + + before do + chat_service.notify_only_default_branch = true + end + + it 'does not call the Slack/Mattermost API for pipeline events' do + data = Gitlab::DataBuilder::Pipeline.build(pipeline) + result = chat_service.execute(data) + + expect(result).to be_falsy + end + end + end end end |
