diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-15 15:17:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-15 15:17:08 +0000 |
| commit | 6f50cef8094d9b14d2bdff731f0eeb01c31516bf (patch) | |
| tree | b03f72adbb3c156bcf893b1218eabbcb7d6c7372 /features/project | |
| parent | a628db7b4d8c83a80d3151ba7a4c3d694b1a678c (diff) | |
| parent | e632bd26e4b70b100e5c9891b4b2cc7e267080c9 (diff) | |
| download | gitlab-ce-6f50cef8094d9b14d2bdff731f0eeb01c31516bf.tar.gz | |
Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master'
Fixes "iid of max iid" in Issuable sidebar for merged MR
Fixes #13928.
See merge request !3046
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/merge_requests.feature | 9 |
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" |