From 5ed2465c1af700bd32242d0f1f04a1968ee65039 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 2 May 2017 17:00:57 +0100 Subject: [PATCH] Fixed tests --- spec/features/projects/merge_request_button_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb index 1a4d613ef94..1370ab1c521 100644 --- a/spec/features/projects/merge_request_button_spec.rb +++ b/spec/features/projects/merge_request_button_spec.rb @@ -25,7 +25,7 @@ feature 'Merge Request button', feature: true do it 'shows Create merge request button' do href = new_namespace_project_merge_request_path(project.namespace, project, - merge_request: { source_branch: "'test'", + merge_request: { source_branch: 'feature', target_branch: 'master' }) visit url @@ -69,7 +69,7 @@ feature 'Merge Request button', feature: true do it 'shows Create merge request button' do href = new_namespace_project_merge_request_path(forked_project.namespace, forked_project, - merge_request: { source_branch: "'test'", + merge_request: { source_branch: 'feature', target_branch: 'master' }) visit fork_url @@ -93,16 +93,16 @@ feature 'Merge Request button', feature: true do context 'on compare page' do it_behaves_like 'Merge request button only shown when allowed' do let(:label) { 'Create merge request' } - let(:url) { namespace_project_compare_path(project.namespace, project, from: 'master', to: "'test'") } - let(:fork_url) { namespace_project_compare_path(forked_project.namespace, forked_project, from: 'master', to: "'test'") } + let(:url) { namespace_project_compare_path(project.namespace, project, from: 'master', to: 'feature') } + let(:fork_url) { namespace_project_compare_path(forked_project.namespace, forked_project, from: 'master', to: 'feature') } end end context 'on commits page' do it_behaves_like 'Merge request button only shown when allowed' do let(:label) { 'Create merge request' } - let(:url) { namespace_project_commits_path(project.namespace, project, "'test'") } - let(:fork_url) { namespace_project_commits_path(forked_project.namespace, forked_project, "'test'") } + let(:url) { namespace_project_commits_path(project.namespace, project, 'feature') } + let(:fork_url) { namespace_project_commits_path(forked_project.namespace, forked_project, 'feature') } end end end