summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2017-09-11 15:42:13 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2017-09-11 15:42:13 +1100
commitda31584deafb8346b7889a7e98c534a08f57f5d8 (patch)
tree8a6ca18ccfce8d1c0dfa0f5f967da47a8d6f114b /features/project
parentce14fae5d43247a838debeb5dda7871845d127c8 (diff)
downloadgitlab-ce-da31584deafb8346b7889a7e98c534a08f57f5d8.tar.gz
Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog
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