kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed tests

This commit is contained in:
Luke "Jared" Bennett 2017-05-02 17:00:57 +01:00
parent ef7001c9c6
commit 5ed2465c1a
No known key found for this signature in database
GPG Key ID: 402ED51FB5D306C2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spec/features/projects/merge_request_button_spec.rb
View File

@ -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