summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-06 12:52:07 +0100
committerPhil Hughes <me@iamphill.com>2016-04-06 12:52:07 +0100
commit017ed4ae37474ba43cbf4f4ee7c12d8aeec70598 (patch)
treea1ad95798809f93b6eb989e71d61afe6849d581c /features/project
parent8cdb50587805afa4177ee6cb938a0b5846a1641f (diff)
downloadgitlab-ce-017ed4ae37474ba43cbf4f4ee7c12d8aeec70598.tar.gz
Fixed builds
Diffstat (limited to 'features/project')
-rw-r--r--features/project/forked_merge_requests.feature1
-rw-r--r--features/project/merge_requests.feature1
2 files changed, 2 insertions, 0 deletions
diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature
index 10bd6fec803..67f1e117f7f 100644
--- a/features/project/forked_merge_requests.feature
+++ b/features/project/forked_merge_requests.feature
@@ -4,6 +4,7 @@ Feature: Project Forked Merge Requests
And I am a member of project "Shop"
And I have a project forked off of "Shop" called "Forked Shop"
+ @javascript
Scenario: I submit new unassigned merge request to a forked project
Given I visit project "Forked Shop" merge requests page
And I click link "New Merge Request"
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 823658b4f24..ecda4ea8240 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -70,6 +70,7 @@ Feature: Project Merge Requests
When I click link "Reopen"
Then I should see reopened merge request "Bug NS-04"
+ @javascript
Scenario: I submit new unassigned merge request
Given I click link "New Merge Request"
And I submit new merge request "Wiki Feature"