summaryrefslogtreecommitdiff
path: root/features/project/merge_requests.feature
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-06-08 18:50:24 +0300
committerFatih Acet <acetfatih@gmail.com>2016-06-08 18:50:24 +0300
commitcae84aa2788af60219bbca1a83ae63941f11bf47 (patch)
tree23f0581d48ebc62f6916bf50731377772ed6b510 /features/project/merge_requests.feature
parent57ec290f0c47d04745e49598c490735b3e650edb (diff)
parent53498e42868f258a5e0cda7894fa4de8e8d4f8e9 (diff)
downloadgitlab-ce-cae84aa2788af60219bbca1a83ae63941f11bf47.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown
Diffstat (limited to 'features/project/merge_requests.feature')
-rw-r--r--features/project/merge_requests.feature12
1 files changed, 0 insertions, 12 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 396eb7cc11b..0e97e4d5954 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -74,18 +74,6 @@ Feature: Project Merge Requests
And I submit new merge request "Wiki Feature"
Then I should see merge request "Wiki Feature"
- Scenario: I download a diff on a public merge request
- Given public project "Community"
- And "John Doe" owns public project "Community"
- And project "Community" has "Bug CO-01" open merge request with diffs inside
- Given I logout directly
- And I visit merge request page "Bug CO-01"
- And I click on "Email Patches"
- Then I should see a patch diff
- And I visit merge request page "Bug CO-01"
- And I click on "Plain Diff"
- Then I should see a patch diff
-
@javascript
Scenario: I comment on a merge request
Given I visit merge request page "Bug NS-04"