summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-05-26 17:59:45 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-06-07 11:10:24 +0200
commit5677cb0114de78559bb626aa3b0bb456271429df (patch)
tree75d24dc38071e11ef11a56a43b93c960d2a40d35 /features
parentf51e78715f77846f3326a0cad18a826f138f2dff (diff)
downloadgitlab-ce-5677cb0114de78559bb626aa3b0bb456271429df.tar.gz
Seperated Dropdown in new partial
Fixed different issues from discussion Fixed a Spinach Test which had now 2 New buttons
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/fork.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index 14932491daa..35df403a85f 100644
--- a/features/steps/project/fork.rb
+++ b/features/steps/project/fork.rb
@@ -42,7 +42,9 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
end
step 'I click link "New merge request"' do
- page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request')
+ page.within '#content-body' do
+ page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request')
+ end
end
step 'I should see the new merge request page for my namespace' do