Commit 8238225b authored by Nick Thomas's avatar Nick Thomas

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

parent 4aec4c3f
......@@ -48,7 +48,7 @@ feature 'Squashing merge requests', js: true, feature: true do
context 'when squash is enabled on merge request creation' do
before do
visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { source_branch: source_branch })
visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { target_branch: 'master', source_branch: source_branch })
check 'merge_request[squash]'
click_on 'Submit merge request'
wait_for_ajax
......@@ -78,7 +78,7 @@ feature 'Squashing merge requests', js: true, feature: true do
context 'when squash is not enabled on merge request creation' do
before do
visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { source_branch: source_branch })
visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { target_branch: 'master', source_branch: source_branch })
click_on 'Submit merge request'
wait_for_ajax
end
......
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