summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-18 14:49:00 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-03-18 14:49:00 +0000
commit9280fd4acda1da9ed2435bd83d96892d77f37e90 (patch)
tree5020e55e312c08cace492d0e2b345c1f08d24a7b /features
parent8dfa0a76492743edbb4266781c9655aae9564723 (diff)
parent195ef985f3271e5c64010f192bfe5ee1c78e2ba8 (diff)
downloadgitlab-ce-9280fd4acda1da9ed2435bd83d96892d77f37e90.tar.gz
Merge branch 'fix-mr-close-button' into 'master'
Fixes issue with close button not working on MR Closes #14383 See merge request !3295
Diffstat (limited to 'features')
-rw-r--r--features/project/merge_requests.feature8
1 files changed, 8 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 74685d24a7d..823658b4f24 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -325,3 +325,11 @@ Feature: Project Merge Requests
When I click the "Target branch" dropdown
And I select a new target branch
Then I should see new target branch changes
+
+ @javascript
+ Scenario: I can close merge request after commenting
+ Given I visit merge request page "Bug NS-04"
+ And I leave a comment like "XML attached"
+ Then I should see comment "XML attached"
+ And I click link "Close"
+ Then I should see closed merge request "Bug NS-04"