Skip to content
Snippets Groups Projects
Verified Commit 5ed2465c authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett
Browse files

Fixed tests

parent ef7001c9
No related branches found
No related tags found
1 merge request!10564Initial balsamiq support
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment