From cc4b0a55bd4a2ef5992c8b5ea0102b0dc40cf616 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Sat, 30 Jul 2016 01:24:03 +0800 Subject: Fix test for checking everything for Slack service --- features/steps/admin/settings.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'features') diff --git a/features/steps/admin/settings.rb b/features/steps/admin/settings.rb index 03f87df7a60..11dc7f580f0 100644 --- a/features/steps/admin/settings.rb +++ b/features/steps/admin/settings.rb @@ -33,6 +33,7 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps page.check('Issue') page.check('Merge request') page.check('Build') + page.check('Pipeline') click_on 'Save' end -- cgit v1.2.3 From 035a38f18ea7bec1afd64218866a2fd986449b00 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 7 Sep 2016 16:18:15 +0300 Subject: Fix issuable_bulk_update_path and merge request spinach test Signed-off-by: Dmitriy Zaporozhets --- features/steps/project/merge_requests.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'features') diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 56b28949585..df17b5626c6 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -31,7 +31,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I click link "Closed"' do - click_link "Closed" + page.within('.issues-state-filters') do + click_link "Closed" + end end step 'I should see merge request "Wiki Feature"' do -- cgit v1.2.3 From 9abd871a03ead34945f7dff050f92d7ab9225472 Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Fri, 16 Sep 2016 10:37:19 +0100 Subject: Added full-width new snippet button on mobile and corrected capitalization Altered specs that click capitalised New Snippet button Applied review feedback missed in Changes `.no-comment` `opactiy: 0.5` to `opacity: .5` Added `.btn-wide-on-xs` and applied to snippet buttons --- features/project/snippets.feature | 2 +- features/steps/project/snippets.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'features') diff --git a/features/project/snippets.feature b/features/project/snippets.feature index 270557cbde7..3c51ea56585 100644 --- a/features/project/snippets.feature +++ b/features/project/snippets.feature @@ -12,7 +12,7 @@ Feature: Project Snippets And I should not see "Snippet two" in snippets Scenario: I create new project snippet - Given I click link "New Snippet" + Given I click link "New snippet" And I submit new snippet "Snippet three" Then I should see snippet "Snippet three" diff --git a/features/steps/project/snippets.rb b/features/steps/project/snippets.rb index beb8ecfc799..5e7d539add6 100644 --- a/features/steps/project/snippets.rb +++ b/features/steps/project/snippets.rb @@ -21,8 +21,8 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps author: project.users.first) end - step 'I click link "New Snippet"' do - click_link "New Snippet" + step 'I click link "New snippet"' do + click_link "New snippet" end step 'I click link "Snippet one"' do -- cgit v1.2.3 From 418e95bd5f623c4cbeac8f5c2fdf2a50e8893339 Mon Sep 17 00:00:00 2001 From: barthc Date: Mon, 27 Jun 2016 21:22:19 +0100 Subject: fix issues mr counter --- features/steps/project/issues/issues.rb | 2 +- features/steps/project/merge_requests.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'features') diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index e21f76d00d9..ed7241679ee 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -356,6 +356,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end def filter_issue(text) - fill_in 'issue_search', with: text + fill_in 'issuable_search', with: text end end diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index df17b5626c6..4a67cf06fba 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -493,7 +493,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I fill in merge request search with "Fe"' do - fill_in 'issue_search', with: "Fe" + fill_in 'issuable_search', with: "Fe" end step 'I click the "Target branch" dropdown' do -- cgit v1.2.3 From 0275f203ef857a54a523614cbd3136f9a7a311d6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 26 Sep 2016 19:24:14 +0300 Subject: Add organization field to user profile Signed-off-by: Dmitriy Zaporozhets --- features/steps/profile/profile.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'features') diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb index 4ee6784a086..05ab2a7dc73 100644 --- a/features/steps/profile/profile.rb +++ b/features/steps/profile/profile.rb @@ -13,6 +13,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps fill_in 'user_website_url', with: 'testurl' fill_in 'user_location', with: 'Ukraine' fill_in 'user_bio', with: 'I <3 GitLab' + fill_in 'user_organization', with: 'GitLab' click_button 'Update profile settings' @user.reload end @@ -23,6 +24,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps expect(@user.twitter).to eq 'testtwitter' expect(@user.website_url).to eq 'testurl' expect(@user.bio).to eq 'I <3 GitLab' + expect(@user.organization).to eq 'GitLab' expect(find('#user_location').value).to eq 'Ukraine' end -- cgit v1.2.3