summaryrefslogtreecommitdiff
path: root/features/project/merge_requests.feature
diff options
context:
space:
mode:
Diffstat (limited to 'features/project/merge_requests.feature')
-rw-r--r--features/project/merge_requests.feature10
1 files changed, 10 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 63f27c3acc3..4e4ac1a68e4 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -67,3 +67,13 @@ Feature: Project Merge Requests
And I leave a comment on the diff page
And I switch to the merge request's comments tab
Then I should see a discussion has started on commit bcf03b5de6c
+
+ @javascript
+ Scenario: I accept merge request with custom commit message
+ Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+ And merge request "Bug NS-05" is mergeable
+ And I visit merge request page "Bug NS-05"
+ And merge request is mergeable
+ Then I modify merge commit message
+ And I accept this merge request
+ Then I should see merged request