Commit dddda49f authored by Nick Thomas's avatar Nick Thomas

Fix spec/features/merge_requests/create_new_mr_spec.rb spec failures

parent 5fb3a786
...@@ -36,7 +36,7 @@ feature 'Create New Merge Request', feature: true, js: true do ...@@ -36,7 +36,7 @@ feature 'Create New Merge Request', feature: true, js: true do
context 'when approvals are disabled for the target project' do context 'when approvals are disabled for the target project' do
it 'does not show approval settings' do it 'does not show approval settings' do
visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { source_branch: 'feature_conflict' }) visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { target_branch: 'master', source_branch: 'feature_conflict' })
expect(page).not_to have_content('Approvers') expect(page).not_to have_content('Approvers')
end end
...@@ -46,7 +46,7 @@ feature 'Create New Merge Request', feature: true, js: true do ...@@ -46,7 +46,7 @@ feature 'Create New Merge Request', feature: true, js: true do
before do before do
project.update_attributes(approvals_before_merge: 1) project.update_attributes(approvals_before_merge: 1)
visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { source_branch: 'feature_conflict' }) visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { target_branch: 'master', source_branch: 'feature_conflict' })
end end
it 'shows approval settings' do it 'shows approval settings' 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