summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-11 16:45:45 +0000
committerRémy Coutable <remy@rymai.me>2017-09-11 16:45:45 +0000
commitde14e9c20392c4edfb9ee05f8a3364d7510a4f99 (patch)
tree1b64a20695aad43e425dfb3c7807406691b7aace /features/project
parent73a913f2b5f2a5dd36e13e09d74264d1da218d6a (diff)
parentda31584deafb8346b7889a7e98c534a08f57f5d8 (diff)
downloadgitlab-ce-de14e9c20392c4edfb9ee05f8a3364d7510a4f99.tar.gz
Merge branch 'replace_project_merge_requests_accept.feature' into 'master'
Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog See merge request !14176
Diffstat (limited to 'features/project')
-rw-r--r--features/project/merge_requests/accept.feature28
1 files changed, 0 insertions, 28 deletions
diff --git a/features/project/merge_requests/accept.feature b/features/project/merge_requests/accept.feature
deleted file mode 100644
index 2ab1c19f452..00000000000
--- a/features/project/merge_requests/accept.feature
+++ /dev/null
@@ -1,28 +0,0 @@
-@project_merge_requests
-Feature: Project Merge Requests Acceptance
- Background:
- Given There is an open Merge Request
- And I am signed in as a developer of the project
-
- @javascript
- Scenario: Accepting the Merge Request and removing the source branch
- Given I am on the Merge Request detail page
- When I check the "Remove source branch" option
- And I click on Accept Merge Request
- Then I should see merge request merged
- And I should not see the Remove Source Branch button
-
- @javascript
- Scenario: Accepting the Merge Request when URL has an anchor
- Given I am on the Merge Request detail with note anchor page
- When I check the "Remove source branch" option
- And I click on Accept Merge Request
- Then I should see merge request merged
- And I should not see the Remove Source Branch button
-
- @javascript
- Scenario: Accepting the Merge Request without removing the source branch
- Given I am on the Merge Request detail page
- When I click on Accept Merge Request
- Then I should see merge request merged
- And I should see the Remove Source Branch button