Commit 9b1562a6 authored by Nick Thomas's avatar Nick Thomas

Fix conflicts in spinach test suite

parent ec426c20
......@@ -58,10 +58,7 @@ module SharedIssuable
step 'I visit merge request page "Enterprise fix"' do
mr = MergeRequest.find_by(title: 'Enterprise fix')
visit project_merge_request_path(mr.target_project, mr)
<<<<<<< HEAD
wait_for_requests
=======
>>>>>>> ce/master
end
step 'I visit issue page "Community issue"' do
......
......@@ -274,13 +274,10 @@ module SharedPaths
step 'I visit project hooks page' do
visit project_settings_integrations_path(@project)
<<<<<<< HEAD
end
step 'I visit group hooks page' do
visit group_hooks_path(@group)
=======
>>>>>>> ce/master
end
step 'I visit project deploy keys page' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment