summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-07-06 17:52:00 -0300
committerFelipe Artur <felipefac@gmail.com>2016-07-19 20:57:59 -0300
commit8bd520d70e035cd67d19b7962911ae9c31d1ff3d (patch)
treedd3e8bf4925f36758825879857a54b7d5e94a638 /features
parentb9ed9d658ad447a64d58b2040849a7cc0e698287 (diff)
downloadgitlab-ce-8bd520d70e035cd67d19b7962911ae9c31d1ff3d.tar.gz
Allow slack service to send messages on different channels
Diffstat (limited to 'features')
-rw-r--r--features/steps/admin/settings.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/features/steps/admin/settings.rb b/features/steps/admin/settings.rb
index 037f7494a77..03f87df7a60 100644
--- a/features/steps/admin/settings.rb
+++ b/features/steps/admin/settings.rb
@@ -27,19 +27,19 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps
step 'I check all events and submit form' do
page.check('Active')
- page.check('Push events')
- page.check('Tag push events')
- page.check('Comments')
- page.check('Issues events')
- page.check('Merge Request events')
- page.check('Build events')
+ page.check('Push')
+ page.check('Tag push')
+ page.check('Note')
+ page.check('Issue')
+ page.check('Merge request')
+ page.check('Build')
click_on 'Save'
end
step 'I fill out Slack settings' do
fill_in 'Webhook', with: 'http://localhost'
fill_in 'Username', with: 'test_user'
- fill_in 'Channel', with: '#test_channel'
+ fill_in 'service_push_channel', with: '#test_channel'
page.check('Notify only broken builds')
end
@@ -56,6 +56,6 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps
step 'I should see Slack settings saved' do
expect(find_field('Webhook').value).to eq 'http://localhost'
expect(find_field('Username').value).to eq 'test_user'
- expect(find_field('Channel').value).to eq '#test_channel'
+ expect(find('#service_push_channel').value).to eq '#test_channel'
end
end