diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-06-08 10:15:27 -0500 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-06-08 10:15:27 -0500 |
commit | b55bd9ef95734a6805b11a8a8322149e885425a6 (patch) | |
tree | 769f52169d7ad85d68aea3218c7e9116f9269b25 /features/steps/project/fork.rb | |
parent | c24b70682448f23d7eb01853026cfe6abdf86190 (diff) | |
parent | b4972c4b237ad270ad1a4054c2fe2439d60ee06d (diff) | |
download | gitlab-ce-b55bd9ef95734a6805b11a8a8322149e885425a6.tar.gz |
Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-ui
Diffstat (limited to 'features/steps/project/fork.rb')
-rw-r--r-- | features/steps/project/fork.rb | 4 |
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 |