summaryrefslogtreecommitdiff
path: root/features/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/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/project')
-rw-r--r--features/project/merge_requests.feature9
1 files changed, 8 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"