diff options
author | Rémy Coutable <remy@rymai.me> | 2016-03-01 12:32:20 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-08 16:23:20 +0100 |
commit | e632bd26e4b70b100e5c9891b4b2cc7e267080c9 (patch) | |
tree | 60bebb20fd06870a3a2a4f1164b7c43571479b17 /features | |
parent | 36730e8e63c0ebe16785f33cb2b740f8d67b2b25 (diff) | |
download | gitlab-ce-e632bd26e4b70b100e5c9891b4b2cc7e267080c9.tar.gz |
Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iid
Fixes #13928
Diffstat (limited to 'features')
-rw-r--r-- | features/project/merge_requests.feature | 9 | ||||
-rw-r--r-- | features/steps/project/merge_requests.rb | 20 | ||||
-rw-r--r-- | features/steps/shared/issuable.rb | 4 |
3 files changed, 32 insertions, 1 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index f8d9fe1854d..74685d24a7d 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -46,11 +46,18 @@ Feature: Project Merge Requests Then I should see "Feature NS-03" in merge requests And I should see "Bug NS-04" in merge requests - Scenario: I visit merge request page + Scenario: I visit an open merge request page Given I click link "Bug NS-04" Then I should see merge request "Bug NS-04" And I should see "1 of 1" in the sidebar + Scenario: I visit a merged merge request page + Given project "Shop" have "Feature NS-05" merged merge request + And I click link "Merged" + And I click link "Feature NS-05" + Then I should see merge request "Feature NS-05" + And I should see "3 of 3" in the sidebar + Scenario: I close merge request page Given I click link "Bug NS-04" And I click link "Close" diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index c19b15bc9ed..2eb98e91dbf 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -16,10 +16,18 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps click_link "Bug NS-04" end + step 'I click link "Feature NS-05"' do + click_link "Feature NS-05" + end + step 'I click link "All"' do click_link "All" end + step 'I click link "Merged"' do + click_link "Merged" + end + step 'I click link "Closed"' do click_link "Closed" end @@ -40,6 +48,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps expect(page).to have_content "Bug NS-04" end + step 'I should see merge request "Feature NS-05"' do + expect(page).to have_content "Feature NS-05" + end + step 'I should not see "master" branch' do expect(find('.merge-request-info')).not_to have_content "master" end @@ -120,6 +132,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps author: project.users.first) end + step 'project "Shop" have "Feature NS-05" merged merge request' do + create(:merged_merge_request, + title: "Feature NS-05", + source_project: project, + target_project: project, + author: project.users.first) + end + step 'project "Shop" have "Bug NS-07" open merge request with rebased branch' do create(:merge_request, :rebased, title: "Bug NS-07", diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb index ae10c6069a9..7c094bab8aa 100644 --- a/features/steps/shared/issuable.rb +++ b/features/steps/shared/issuable.rb @@ -147,6 +147,10 @@ module SharedIssuable expect_sidebar_content('2 of 2') end + step 'I should see "3 of 3" in the sidebar' do + expect_sidebar_content('3 of 3') + end + step 'I click link "Next" in the sidebar' do page.within '.issuable-sidebar' do click_link 'Next' |