summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-12 06:37:40 +0000
committerRémy Coutable <remy@rymai.me>2017-09-12 06:37:40 +0000
commit19df4a8a875e7ebe0fb70b97080c75b89a7ac440 (patch)
tree34eadf3cfaf83817ec3c826a9de91a12dc4fcbc5 /features/project
parent90ac1bfb55a4bbd297e66e5a8c7206f97d21ab92 (diff)
parent44a1759f191ef6b148eec93d2712897248e9f8e1 (diff)
downloadgitlab-ce-19df4a8a875e7ebe0fb70b97080c75b89a7ac440.tar.gz
Merge branch 'replace_project_merge_requests_revert.feature' into 'master'
Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog See merge request !14201
Diffstat (limited to 'features/project')
-rw-r--r--features/project/merge_requests/revert.feature29
1 files changed, 0 insertions, 29 deletions
diff --git a/features/project/merge_requests/revert.feature b/features/project/merge_requests/revert.feature
deleted file mode 100644
index aaac5fd7209..00000000000
--- a/features/project/merge_requests/revert.feature
+++ /dev/null
@@ -1,29 +0,0 @@
-@project_merge_requests
-Feature: Revert Merge Requests
- Background:
- Given There is an open Merge Request
- And I am signed in as a developer of the project
- And I am on the Merge Request detail page
- And I click on Accept Merge Request
- And I am on the Merge Request detail page
-
- @javascript
- Scenario: I revert a merge request
- Given I click on the revert button
- And I revert the changes directly
- Then I should see the revert merge request notice
-
- @javascript
- Scenario: I revert a merge request that was previously reverted
- Given I click on the revert button
- And I revert the changes directly
- And I am on the Merge Request detail page
- And I click on the revert button
- And I revert the changes directly
- Then I should see a revert error
-
- @javascript
- Scenario: I revert a merge request in a new merge request
- Given I click on the revert button
- And I revert the changes in a new merge request
- Then I should see the new merge request notice