summaryrefslogtreecommitdiff
path: root/spec/features/projects/merge_request_button_spec.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-07-06 12:20:50 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-07-06 12:20:50 -0400
commit9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed (patch)
tree74edd22b27623fc2bd0537be534355a4ce0fdc73 /spec/features/projects/merge_request_button_spec.rb
parentea2a91a36ef94e7e360056b0569377c6fe51491b (diff)
downloadgitlab-ce-9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed.tar.gz
Auto-correct ProjectPathHelper violations
Diffstat (limited to 'spec/features/projects/merge_request_button_spec.rb')
-rw-r--r--spec/features/projects/merge_request_button_spec.rb20
1 files changed, 8 insertions, 12 deletions
diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb
index e8ab482a6e1..8bf6dcdb3b9 100644
--- a/spec/features/projects/merge_request_button_spec.rb
+++ b/spec/features/projects/merge_request_button_spec.rb
@@ -23,9 +23,7 @@ feature 'Merge Request button', feature: true do
end
it 'shows Create merge request button' do
- href = namespace_project_new_merge_request_path(project.namespace,
- project,
- merge_request: { source_branch: 'feature',
+ href = project_new_merge_request_path(project, merge_request: { source_branch: 'feature',
target_branch: 'master' })
visit url
@@ -67,9 +65,7 @@ feature 'Merge Request button', feature: true do
let(:user) { forked_project.owner }
it 'shows Create merge request button' do
- href = namespace_project_new_merge_request_path(forked_project.namespace,
- forked_project,
- merge_request: { source_branch: 'feature',
+ href = project_new_merge_request_path(forked_project, merge_request: { source_branch: 'feature',
target_branch: 'master' })
visit fork_url
@@ -85,24 +81,24 @@ feature 'Merge Request button', feature: true do
context 'on branches page' do
it_behaves_like 'Merge request button only shown when allowed' do
let(:label) { 'Merge request' }
- let(:url) { namespace_project_branches_path(project.namespace, project, search: 'feature') }
- let(:fork_url) { namespace_project_branches_path(forked_project.namespace, forked_project, search: 'feature') }
+ let(:url) { project_branches_path(project, search: 'feature') }
+ let(:fork_url) { project_branches_path(forked_project, search: 'feature') }
end
end
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: 'feature') }
- let(:fork_url) { namespace_project_compare_path(forked_project.namespace, forked_project, from: 'master', to: 'feature') }
+ let(:url) { project_compare_path(project, from: 'master', to: 'feature') }
+ let(:fork_url) { project_compare_path(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, 'feature') }
- let(:fork_url) { namespace_project_commits_path(forked_project.namespace, forked_project, 'feature') }
+ let(:url) { project_commits_path(project, 'feature') }
+ let(:fork_url) { project_commits_path(forked_project, 'feature') }
end
end
end