diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2016-12-20 09:41:37 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2016-12-20 09:41:37 +0000 |
commit | 52278412c7350b8087ef4ffc688c79e4593369cc (patch) | |
tree | 8f6769b3563db7c5d8ebaf01e2b1e939579913e6 /features | |
parent | 7572a31430cd4dbd6ed8d3da5f06010858d7c487 (diff) | |
parent | e06f88effa842c73d3827593f8d28846207bfca0 (diff) | |
download | gitlab-ce-52278412c7350b8087ef4ffc688c79e4593369cc.tar.gz |
Merge branch 'zj-kamil-slack-slash-commands' into 'master'
Slack slash commands
## What does this MR do?
Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements.
## Why was this MR needed?
We want to expose Slack Slash Commands as a first-class service.
## What are the relevant issue numbers?
Supersedes !8007
Closes #22182
See merge request !8126
Diffstat (limited to 'features')
-rw-r--r-- | features/project/service.feature | 8 | ||||
-rw-r--r-- | features/steps/project/services.rb | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/features/project/service.feature b/features/project/service.feature index 3a7b8308524..cce5f58adec 100644 --- a/features/project/service.feature +++ b/features/project/service.feature @@ -37,11 +37,11 @@ Feature: Project Services And I fill Assembla settings Then I should see Assembla service settings saved - Scenario: Activate Slack service + Scenario: Activate Slack notifications service When I visit project "Shop" services page - And I click Slack service link - And I fill Slack settings - Then I should see Slack service settings saved + And I click Slack notifications service link + And I fill Slack notifications settings + Then I should see Slack Notifications service settings saved Scenario: Activate Pushover service When I visit project "Shop" services page diff --git a/features/steps/project/services.rb b/features/steps/project/services.rb index bd6466f3686..a4d29770922 100644 --- a/features/steps/project/services.rb +++ b/features/steps/project/services.rb @@ -137,17 +137,17 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps expect(find_field('Colorize messages').value).to eq '1' end - step 'I click Slack service link' do - click_link 'Slack' + step 'I click Slack notifications service link' do + click_link 'Slack notifications' end - step 'I fill Slack settings' do + step 'I fill Slack notifications settings' do check 'Active' fill_in 'Webhook', with: 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685' click_button 'Save' end - step 'I should see Slack service settings saved' do + step 'I should see Slack Notifications service settings saved' do expect(find_field('Webhook').value).to eq 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685' end |