summaryrefslogtreecommitdiff
path: root/features/steps/project/fork.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-06-08 00:20:52 +0000
committerDouwe Maan <douwe@gitlab.com>2017-06-08 00:20:52 +0000
commit27f68edd35d55e5620458a27321b8a440aa2f9fd (patch)
treefd57e9dc02ee465372b09677267f9db90d97b3db /features/steps/project/fork.rb
parentdd80b629167e8fdfa9b4a28fe4de11bbaac46074 (diff)
parent39d976cf5881c947eefeb45a2f8fe2922923eac6 (diff)
downloadgitlab-ce-27f68edd35d55e5620458a27321b8a440aa2f9fd.tar.gz
Merge branch '23603-add-extra-functionality-for-the-top-right-plus-button' into 'master'
Resolve "Add extra functionality for the top right Plus Button" Closes #23603 See merge request !11632
Diffstat (limited to 'features/steps/project/fork.rb')
-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