From 2988e1fbf50b3c9e803a9358933e3e969e64dcc3 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Mon, 7 Dec 2015 13:23:23 +0100 Subject: Migrate CI::Services and CI::WebHooks to Services and WebHooks --- features/project/service.feature | 8 ++++---- features/steps/admin/settings.rb | 2 ++ features/steps/project/services.rb | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'features') diff --git a/features/project/service.feature b/features/project/service.feature index 5014b52b9f6..13edc6cb2b9 100644 --- a/features/project/service.feature +++ b/features/project/service.feature @@ -55,11 +55,11 @@ Feature: Project Services And I fill Pushover settings Then I should see Pushover service settings saved - Scenario: Activate email on push service + Scenario: Activate email service When I visit project "Shop" services page - And I click email on push service link - And I fill email on push settings - Then I should see email on push service settings saved + And I click email service link + And I fill email settings + Then I should see email service settings saved Scenario: Activate Irker (IRC Gateway) service When I visit project "Shop" services page diff --git a/features/steps/admin/settings.rb b/features/steps/admin/settings.rb index 6acbf46eb20..037f7494a77 100644 --- a/features/steps/admin/settings.rb +++ b/features/steps/admin/settings.rb @@ -32,6 +32,7 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps page.check('Comments') page.check('Issues events') page.check('Merge Request events') + page.check('Build events') click_on 'Save' end @@ -39,6 +40,7 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps fill_in 'Webhook', with: 'http://localhost' fill_in 'Username', with: 'test_user' fill_in 'Channel', with: '#test_channel' + page.check('Notify only broken builds') end step 'I should see service template settings saved' do diff --git a/features/steps/project/services.rb b/features/steps/project/services.rb index 1c700df0c63..2d564dac498 100644 --- a/features/steps/project/services.rb +++ b/features/steps/project/services.rb @@ -118,16 +118,16 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps expect(find_field('Restrict to branch').value).to eq 'master' end - step 'I click email on push service link' do - click_link 'Emails on push' + step 'I click email service link' do + click_link 'Emails' end - step 'I fill email on push settings' do + step 'I fill email settings' do fill_in 'Recipients', with: 'qa@company.name' click_button 'Save' end - step 'I should see email on push service settings saved' do + step 'I should see email service settings saved' do expect(find_field('Recipients').value).to eq 'qa@company.name' end -- cgit v1.2.1 From c4fa894de22a6ba20f3078f490b708c81b6d6464 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Thu, 10 Dec 2015 16:16:34 +0100 Subject: Fix specs --- features/project/service.feature | 8 ++++---- features/steps/project/services.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'features') diff --git a/features/project/service.feature b/features/project/service.feature index 13edc6cb2b9..5014b52b9f6 100644 --- a/features/project/service.feature +++ b/features/project/service.feature @@ -55,11 +55,11 @@ Feature: Project Services And I fill Pushover settings Then I should see Pushover service settings saved - Scenario: Activate email service + Scenario: Activate email on push service When I visit project "Shop" services page - And I click email service link - And I fill email settings - Then I should see email service settings saved + And I click email on push service link + And I fill email on push settings + Then I should see email on push service settings saved Scenario: Activate Irker (IRC Gateway) service When I visit project "Shop" services page diff --git a/features/steps/project/services.rb b/features/steps/project/services.rb index 2d564dac498..1c700df0c63 100644 --- a/features/steps/project/services.rb +++ b/features/steps/project/services.rb @@ -118,16 +118,16 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps expect(find_field('Restrict to branch').value).to eq 'master' end - step 'I click email service link' do - click_link 'Emails' + step 'I click email on push service link' do + click_link 'Emails on push' end - step 'I fill email settings' do + step 'I fill email on push settings' do fill_in 'Recipients', with: 'qa@company.name' click_button 'Save' end - step 'I should see email service settings saved' do + step 'I should see email on push service settings saved' do expect(find_field('Recipients').value).to eq 'qa@company.name' end -- cgit v1.2.1