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

8238225b · Nick Thomas · 4aec4c3f · 8238225b
Commit 8238225b authored Feb 03, 2017 by Nick Thomas
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

spec/features/merge_requests/squash_spec.rb spec/features/merge_requests/squash_spec.rb +2 -2

No files found.
--- a/spec/features/merge_requests/squash_spec.rb
+++ b/spec/features/merge_requests/squash_spec.rb
@@ -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