summaryrefslogtreecommitdiff
path: root/features/steps/project
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-03-01 12:32:20 +0100
committerRémy Coutable <remy@rymai.me>2016-03-08 16:23:20 +0100
commite632bd26e4b70b100e5c9891b4b2cc7e267080c9 (patch)
tree60bebb20fd06870a3a2a4f1164b7c43571479b17 /features/steps/project
parent36730e8e63c0ebe16785f33cb2b740f8d67b2b25 (diff)
downloadgitlab-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/steps/project')
-rw-r--r--features/steps/project/merge_requests.rb20
1 files changed, 20 insertions, 0 deletions
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",