From e06f88effa842c73d3827593f8d28846207bfca0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 19 Dec 2016 22:12:30 +0100
Subject: [PATCH] Fix specs
---
features/project/service.feature | 6 ++--
features/steps/project/services.rb | 6 ++--
.../services/slack_slash_command_spec.rb | 36 ++++++++-----------
3 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/features/project/service.feature b/features/project/service.feature
index 892db48d785..cce5f58adec 100644
--- a/features/project/service.feature
+++ b/features/project/service.feature
@@ -37,10 +37,10 @@ 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 Notifications service link
- And I fill Slack Notifications settings
+ 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
diff --git a/features/steps/project/services.rb b/features/steps/project/services.rb
index 06a1afedbd9..a4d29770922 100644
--- a/features/steps/project/services.rb
+++ b/features/steps/project/services.rb
@@ -137,11 +137,11 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
expect(find_field('Colorize messages').value).to eq '1'
end
- step 'I click Slack Notifications service link' do
- click_link 'Slack Notifications'
+ step 'I click Slack notifications service link' do
+ click_link 'Slack notifications'
end
- step 'I fill Slack Notifications 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'
diff --git a/spec/features/projects/services/slack_slash_command_spec.rb b/spec/features/projects/services/slack_slash_command_spec.rb
index 70e203efcf5..32b32f7ae8e 100644
--- a/spec/features/projects/services/slack_slash_command_spec.rb
+++ b/spec/features/projects/services/slack_slash_command_spec.rb
@@ -12,37 +12,29 @@ feature 'Slack slash commands', feature: true do
login_as(user)
end
- scenario 'user visits the slack slash command config page', js: true do
- it 'shows a help message' do
- visit edit_namespace_project_service_path(project.namespace, project, service)
+ scenario 'user visits the slack slash command config page and shows a help message', js: true do
+ visit edit_namespace_project_service_path(project.namespace, project, service)
- wait_for_ajax
+ wait_for_ajax
- expect(page).to have_content('This service allows GitLab users to perform common')
- end
+ expect(page).to have_content('This service allows GitLab users to perform common')
end
- scenario 'saving a token' do
- given(:token) { ('a'..'z').to_a.join }
+ scenario 'shows the token after saving' do
+ visit edit_namespace_project_service_path(project.namespace, project, service)
- it 'shows the token after saving' do
- visit edit_namespace_project_service_path(project.namespace, project, service)
+ fill_in 'service_token', with: 'token'
+ click_on 'Save'
- fill_in 'service_token', with: token
- click_on 'Save'
+ value = find_field('service_token').value
- value = find_field('service_token').value
-
- expect(value).to eq(token)
- end
+ expect(value).to eq('token')
end
- scenario 'the trigger url' do
- it 'shows the correct url' do
- visit edit_namespace_project_service_path(project.namespace, project, service)
+ scenario 'shows the correct trigger url' do
+ visit edit_namespace_project_service_path(project.namespace, project, service)
- value = find_field('url').value
- expect(value).to match("api/v3/projects/#{project.id}/services/slack_slash_commands/trigger")
- end
+ value = find_field('url').value
+ expect(value).to match("api/v3/projects/#{project.id}/services/slack_slash_commands/trigger")
end
end
--
GitLab