diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-12-18 09:52:17 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-12-19 10:04:31 +1100 |
| commit | b44a2c801a64fb282cea794871fcfcf81e4ec539 (patch) | |
| tree | 32e699b6efa548048abe11f29f84e85e3d2a034f /spec/controllers/projects | |
| parent | 5d68c23792e87e710877e4baf57605bcf11a6cb5 (diff) | |
| download | gitlab-ce-b44a2c801a64fb282cea794871fcfcf81e4ec539.tar.gz | |
Update specs to rails5 formatblackst0ne-convert-specs-rails5-style
Updates specs to use new rails5 format.
The old format:
`get :show, { some: params }, { some: headers }`
The new format:
`get :show, params: { some: params }, headers: { some: headers }`
Diffstat (limited to 'spec/controllers/projects')
64 files changed, 1112 insertions, 825 deletions
diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb index b3c8d6a954e..bd10de45b67 100644 --- a/spec/controllers/projects/artifacts_controller_spec.rb +++ b/spec/controllers/projects/artifacts_controller_spec.rb @@ -22,7 +22,7 @@ describe Projects::ArtifactsController do def download_artifact(extra_params = {}) params = { namespace_id: project.namespace, project_id: project, job_id: job }.merge(extra_params) - get :download, params + get :download, params: params end context 'when no file type is supplied' do @@ -86,7 +86,7 @@ describe Projects::ArtifactsController do describe 'GET browse' do context 'when the directory exists' do it 'renders the browse view' do - get :browse, namespace_id: project.namespace, project_id: project, job_id: job, path: 'other_artifacts_0.1.2' + get :browse, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'other_artifacts_0.1.2' } expect(response).to render_template('projects/artifacts/browse') end @@ -94,7 +94,7 @@ describe Projects::ArtifactsController do context 'when the directory does not exist' do it 'responds Not Found' do - get :browse, namespace_id: project.namespace, project_id: project, job_id: job, path: 'unknown' + get :browse, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'unknown' } expect(response).to be_not_found end @@ -113,7 +113,7 @@ describe Projects::ArtifactsController do context 'when the file exists' do it 'renders the file view' do - get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt' + get :file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt' } expect(response).to have_gitlab_http_status(302) end @@ -121,7 +121,7 @@ describe Projects::ArtifactsController do context 'when the file does not exist' do it 'responds Not Found' do - get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'unknown' + get :file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'unknown' } expect(response).to be_not_found end @@ -131,7 +131,7 @@ describe Projects::ArtifactsController do context 'when the file is served through Rails' do context 'when the file exists' do it 'renders the file view' do - get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt' + get :file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt' } expect(response).to have_gitlab_http_status(:ok) expect(response).to render_template('projects/artifacts/file') @@ -140,7 +140,7 @@ describe Projects::ArtifactsController do context 'when the file does not exist' do it 'responds Not Found' do - get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'unknown' + get :file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'unknown' } expect(response).to be_not_found end @@ -159,7 +159,7 @@ describe Projects::ArtifactsController do end it 'does not redirect the request' do - get :file, namespace_id: private_project.namespace, project_id: private_project, job_id: job, path: 'ci_artifacts.txt' + get :file, params: { namespace_id: private_project.namespace, project_id: private_project, job_id: job, path: 'ci_artifacts.txt' } expect(response).to have_gitlab_http_status(:ok) expect(response).to render_template('projects/artifacts/file') @@ -168,7 +168,7 @@ describe Projects::ArtifactsController do end describe 'GET raw' do - subject { get(:raw, namespace_id: project.namespace, project_id: project, job_id: job, path: path) } + subject { get(:raw, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: path }) } context 'when the file exists' do let(:path) { 'ci_artifacts.txt' } @@ -239,7 +239,7 @@ describe Projects::ArtifactsController do context 'has no such ref' do before do - get :latest_succeeded, params_from_ref('TAIL', job.name) + get :latest_succeeded, params: params_from_ref('TAIL', job.name) end it_behaves_like 'not found' @@ -247,7 +247,7 @@ describe Projects::ArtifactsController do context 'has no such job' do before do - get :latest_succeeded, params_from_ref(pipeline.ref, 'NOBUILD') + get :latest_succeeded, params: params_from_ref(pipeline.ref, 'NOBUILD') end it_behaves_like 'not found' @@ -255,7 +255,7 @@ describe Projects::ArtifactsController do context 'has no path' do before do - get :latest_succeeded, params_from_ref(pipeline.sha, job.name, '') + get :latest_succeeded, params: params_from_ref(pipeline.sha, job.name, '') end it_behaves_like 'not found' @@ -276,7 +276,7 @@ describe Projects::ArtifactsController do pipeline.update(ref: 'master', sha: project.commit('master').sha) - get :latest_succeeded, params_from_ref('master') + get :latest_succeeded, params: params_from_ref('master') end it_behaves_like 'redirect to the job' @@ -287,7 +287,7 @@ describe Projects::ArtifactsController do pipeline.update(ref: 'improve/awesome', sha: project.commit('improve/awesome').sha) - get :latest_succeeded, params_from_ref('improve/awesome') + get :latest_succeeded, params: params_from_ref('improve/awesome') end it_behaves_like 'redirect to the job' @@ -298,7 +298,7 @@ describe Projects::ArtifactsController do pipeline.update(ref: 'improve/awesome', sha: project.commit('improve/awesome').sha) - get :latest_succeeded, params_from_ref('improve/awesome', job.name, 'file/README.md') + get :latest_succeeded, params: params_from_ref('improve/awesome', job.name, 'file/README.md') end it 'redirects' do diff --git a/spec/controllers/projects/avatars_controller_spec.rb b/spec/controllers/projects/avatars_controller_spec.rb index 5a77a7ac06f..40ab81395ea 100644 --- a/spec/controllers/projects/avatars_controller_spec.rb +++ b/spec/controllers/projects/avatars_controller_spec.rb @@ -8,7 +8,7 @@ describe Projects::AvatarsController do end describe 'GET #show' do - subject { get :show, namespace_id: project.namespace, project_id: project } + subject { get :show, params: { namespace_id: project.namespace, project_id: project } } context 'when repository has no avatar' do it 'shows 404' do @@ -71,7 +71,7 @@ describe Projects::AvatarsController do describe 'DELETE #destroy' do it 'removes avatar from DB by calling destroy' do - delete :destroy, namespace_id: project.namespace.id, project_id: project.id + delete :destroy, params: { namespace_id: project.namespace.id, project_id: project.id } expect(project.avatar.present?).to be_falsey expect(project).to be_valid diff --git a/spec/controllers/projects/badges_controller_spec.rb b/spec/controllers/projects/badges_controller_spec.rb index dfe34171b55..2556bc3ae50 100644 --- a/spec/controllers/projects/badges_controller_spec.rb +++ b/spec/controllers/projects/badges_controller_spec.rb @@ -23,6 +23,6 @@ describe Projects::BadgesController do end def get_badge(badge) - get badge, namespace_id: project.namespace.to_param, project_id: project, ref: pipeline.ref, format: :svg + get badge, params: { namespace_id: project.namespace.to_param, project_id: project, ref: pipeline.ref }, format: :svg end end diff --git a/spec/controllers/projects/blame_controller_spec.rb b/spec/controllers/projects/blame_controller_spec.rb index fe4c4863717..eb110ea0002 100644 --- a/spec/controllers/projects/blame_controller_spec.rb +++ b/spec/controllers/projects/blame_controller_spec.rb @@ -16,9 +16,11 @@ describe Projects::BlameController do before do get(:show, - namespace_id: project.namespace, - project_id: project, - id: id) + params: { + namespace_id: project.namespace, + project_id: project, + id: id + }) end context "valid file" do diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index 9fc6af6a045..38957e96798 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -11,9 +11,11 @@ describe Projects::BlobController do context 'with file path' do before do get(:show, - namespace_id: project.namespace, - project_id: project, - id: id) + params: { + namespace_id: project.namespace, + project_id: project, + id: id + }) end context "valid branch, valid file" do @@ -48,9 +50,11 @@ describe Projects::BlobController do before do get(:show, - namespace_id: project.namespace, - project_id: project, - id: id, + params: { + namespace_id: project.namespace, + project_id: project, + id: id + }, format: :json) end @@ -66,11 +70,13 @@ describe Projects::BlobController do before do get(:show, - namespace_id: project.namespace, - project_id: project, - id: id, - format: :json, - viewer: 'none') + params: { + namespace_id: project.namespace, + project_id: project, + id: id, + viewer: 'none' + }, + format: :json) end it do @@ -84,9 +90,11 @@ describe Projects::BlobController do context 'with tree path' do before do get(:show, - namespace_id: project.namespace, - project_id: project, - id: id) + params: { + namespace_id: project.namespace, + project_id: project, + id: id + }) controller.instance_variable_set(:@blob, nil) end @@ -109,7 +117,7 @@ describe Projects::BlobController do params = { namespace_id: project.namespace, project_id: project, id: 'master/CHANGELOG' } - get :diff, params.merge(opts) + get :diff, params: params.merge(opts) end before do @@ -200,7 +208,7 @@ describe Projects::BlobController do context 'anonymous' do before do - get :edit, default_params + get :edit, params: default_params end it 'redirects to sign in and returns' do @@ -213,7 +221,7 @@ describe Projects::BlobController do before do sign_in(guest) - get :edit, default_params + get :edit, params: default_params end it 'redirects to blob show' do @@ -227,7 +235,7 @@ describe Projects::BlobController do before do project.add_developer(developer) sign_in(developer) - get :edit, default_params + get :edit, params: default_params end it 'redirects to blob show' do @@ -241,7 +249,7 @@ describe Projects::BlobController do before do project.add_maintainer(maintainer) sign_in(maintainer) - get :edit, default_params + get :edit, params: default_params end it 'redirects to blob show' do @@ -274,7 +282,7 @@ describe Projects::BlobController do end it 'redirects to blob' do - put :update, default_params + put :update, params: default_params expect(response).to redirect_to(blob_after_edit_path) end @@ -284,7 +292,7 @@ describe Projects::BlobController do let(:mr_params) { default_params.merge(from_merge_request_iid: merge_request.iid) } it 'redirects to MR diff' do - put :update, mr_params + put :update, params: mr_params after_edit_path = diffs_project_merge_request_path(project, merge_request) file_anchor = "##{Digest::SHA1.hexdigest('CHANGELOG')}" @@ -298,7 +306,7 @@ describe Projects::BlobController do end it "it redirect to blob" do - put :update, mr_params + put :update, params: mr_params expect(response).to redirect_to(blob_after_edit_path) end @@ -320,7 +328,7 @@ describe Projects::BlobController do end it 'redirects to blob' do - put :update, default_params + put :update, params: default_params expect(response).to redirect_to(project_blob_path(forked_project, 'master/CHANGELOG')) end @@ -331,7 +339,7 @@ describe Projects::BlobController do default_params[:branch_name] = "fork-test-1" default_params[:create_merge_request] = 1 - put :update, default_params + put :update, params: default_params expect(response).to redirect_to( project_new_merge_request_path( @@ -374,7 +382,7 @@ describe Projects::BlobController do let(:after_delete_path) { project_tree_path(project, 'master/files') } it 'redirects to the sub directory' do - delete :destroy, default_params + delete :destroy, params: default_params expect(response).to redirect_to(after_delete_path) end @@ -393,7 +401,7 @@ describe Projects::BlobController do end it 'redirects to the project root' do - delete :destroy, default_params + delete :destroy, params: default_params expect(response).to redirect_to(project_root_path) end @@ -413,7 +421,7 @@ describe Projects::BlobController do let(:after_delete_path) { project_tree_path(project, 'binary-encoding') } it 'redirects to the project root of the branch' do - delete :destroy, default_params + delete :destroy, params: default_params expect(response).to redirect_to(after_delete_path) end diff --git a/spec/controllers/projects/boards_controller_spec.rb b/spec/controllers/projects/boards_controller_spec.rb index 8d503f6ad32..09199067024 100644 --- a/spec/controllers/projects/boards_controller_spec.rb +++ b/spec/controllers/projects/boards_controller_spec.rb @@ -121,8 +121,10 @@ describe Projects::BoardsController do end def list_boards(format: :html) - get :index, namespace_id: project.namespace, - project_id: project, + get :index, params: { + namespace_id: project.namespace, + project_id: project + }, format: format end end @@ -207,9 +209,11 @@ describe Projects::BoardsController do end def read_board(board:, format: :html) - get :show, namespace_id: project.namespace, - project_id: project, - id: board.to_param, + get :show, params: { + namespace_id: project.namespace, + project_id: project, + id: board.to_param + }, format: format end end diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb index 31471cde420..02b3d5269a6 100644 --- a/spec/controllers/projects/branches_controller_spec.rb +++ b/spec/controllers/projects/branches_controller_spec.rb @@ -22,10 +22,12 @@ describe Projects::BranchesController do sign_in(user) post :create, - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - ref: ref + params: { + namespace_id: project.namespace, + project_id: project, + branch_name: branch, + ref: ref + } end context "valid branch name, valid source" do @@ -76,10 +78,12 @@ describe Projects::BranchesController do it 'redirects' do post :create, - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - issue_iid: issue.iid + params: { + namespace_id: project.namespace, + project_id: project, + branch_name: branch, + issue_iid: issue.iid + } expect(subject) .to redirect_to("/#{project.full_path}/tree/1-feature-branch") @@ -89,10 +93,12 @@ describe Projects::BranchesController do expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, "1-feature-branch") post :create, - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - issue_iid: issue.iid + params: { + namespace_id: project.namespace, + project_id: project, + branch_name: branch, + issue_iid: issue.iid + } end context 'repository-less project' do @@ -105,10 +111,12 @@ describe Projects::BranchesController do expect(SystemNoteService).to receive(:new_issue_branch).and_return(true) post :create, - namespace_id: project.namespace.to_param, - project_id: project.to_param, - branch_name: branch, - issue_iid: issue.iid + params: { + namespace_id: project.namespace.to_param, + project_id: project.to_param, + branch_name: branch, + issue_iid: issue.iid + } expect(response).to redirect_to project_tree_path(project, branch) end @@ -121,10 +129,12 @@ describe Projects::BranchesController do expect(SystemNoteService).to receive(:new_issue_branch).and_return(true) post :create, - namespace_id: project.namespace.to_param, - project_id: project.to_param, - branch_name: branch, - issue_iid: issue.iid + params: { + namespace_id: project.namespace.to_param, + project_id: project.to_param, + branch_name: branch, + issue_iid: issue.iid + } expect(response.location).to include(project_new_blob_path(project, branch)) expect(response).to have_gitlab_http_status(302) @@ -156,10 +166,12 @@ describe Projects::BranchesController do expect(SystemNoteService).to receive(:new_issue_branch).and_return(true) post :create, - namespace_id: project.namespace.to_param, - project_id: project.to_param, - branch_name: branch, - issue_iid: issue.iid + params: { + namespace_id: project.namespace.to_param, + project_id: project.to_param, + branch_name: branch, + issue_iid: issue.iid + } expect(response.location).to include(project_new_blob_path(project, branch)) expect(response).to have_gitlab_http_status(302) @@ -173,10 +185,12 @@ describe Projects::BranchesController do expect(SystemNoteService).not_to receive(:new_issue_branch) post :create, - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - issue_iid: issue.iid + params: { + namespace_id: project.namespace, + project_id: project, + branch_name: branch, + issue_iid: issue.iid + } end end @@ -191,10 +205,12 @@ describe Projects::BranchesController do expect(SystemNoteService).not_to receive(:new_issue_branch) post :create, - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - issue_iid: issue.iid + params: { + namespace_id: project.namespace, + project_id: project, + branch_name: branch, + issue_iid: issue.iid + } end end end @@ -228,11 +244,14 @@ describe Projects::BranchesController do end def create_branch(name:, ref:) - post :create, namespace_id: project.namespace.to_param, - project_id: project.to_param, - branch_name: name, - ref: ref, - format: :json + post :create, + format: :json, + params: { + namespace_id: project.namespace.to_param, + project_id: project.to_param, + branch_name: name, + ref: ref + } end end @@ -246,9 +265,11 @@ describe Projects::BranchesController do it 'returns 303' do post :destroy, format: :html, - id: 'foo/bar/baz', - namespace_id: project.namespace, - project_id: project + params: { + id: 'foo/bar/baz', + namespace_id: project.namespace, + project_id: project + } expect(response).to have_gitlab_http_status(303) end @@ -261,10 +282,12 @@ describe Projects::BranchesController do sign_in(user) post :destroy, - format: format, - id: branch, - namespace_id: project.namespace, - project_id: project + format: format, + params: { + id: branch, + namespace_id: project.namespace, + project_id: project + } end context 'as JS' do @@ -359,8 +382,10 @@ describe Projects::BranchesController do describe "DELETE destroy_all_merged" do def destroy_all_merged delete :destroy_all_merged, - namespace_id: project.namespace, - project_id: project + params: { + namespace_id: project.namespace, + project_id: project + } end context 'when user is allowed to push' do @@ -404,10 +429,12 @@ describe Projects::BranchesController do context 'when rendering a JSON format' do it 'filters branches by name' do get :index, - namespace_id: project.namespace, - project_id: project, format: :json, - search: 'master' + params: { + namespace_id: project.namespace, + project_id: project, + search: 'master' + } parsed_response = JSON.parse(response.body) @@ -423,10 +450,12 @@ describe Projects::BranchesController do context 'when cache is enabled yet cold', :request_store do it 'return with a status 200' do get :index, - namespace_id: project.namespace, - project_id: project, - state: 'all', - format: :html + format: :html, + params: { + namespace_id: project.namespace, + project_id: project, + state: 'all' + } expect(response).to have_gitlab_http_status(200) end @@ -439,10 +468,12 @@ describe Projects::BranchesController do it 'return with a status 200' do get :index, - namespace_id: project.namespace, - project_id: project, - state: 'all', - format: :html + format: :html, + params: { + namespace_id: project.namespace, + project_id: project, + state: 'all' + } expect(response).to have_gitlab_http_status(200) end @@ -451,30 +482,36 @@ describe Projects::BranchesController do context 'when deprecated sort/search/page parameters are specified' do it 'returns with a status 301 when sort specified' do get :index, - namespace_id: project.namespace, - project_id: project, - sort: 'updated_asc', - format: :html + format: :html, + params: { + namespace_id: project.namespace, + project_id: project, + sort: 'updated_asc' + } expect(response).to redirect_to project_branches_filtered_path(project, state: 'all') end it 'returns with a status 301 when search specified' do get :index, - namespace_id: project.namespace, - project_id: project, - search: 'feature', - format: :html + format: :html, + params: { + namespace_id: project.namespace, + project_id: project, + search: 'feature' + } expect(response).to redirect_to project_branches_filtered_path(project, state: 'all') end it 'returns with a status 301 when page specified' do get :index, - namespace_id: project.namespace, - project_id: project, - page: 2, - format: :html + format: :html, + params: { + namespace_id: project.namespace, + project_id: project, + page: 2 + } expect(response).to redirect_to project_branches_filtered_path(project, state: 'all') end diff --git a/spec/controllers/projects/ci/lints_controller_spec.rb b/spec/controllers/projects/ci/lints_controller_spec.rb index 1249a5528a9..82c1374aa4f 100644 --- a/spec/controllers/projects/ci/lints_controller_spec.rb +++ b/spec/controllers/projects/ci/lints_controller_spec.rb @@ -13,7 +13,7 @@ describe Projects::Ci::LintsController do before do project.add_developer(user) - get :show, namespace_id: project.namespace, project_id: project + get :show, params: { namespace_id: project.namespace, project_id: project } end it 'should be success' do @@ -33,7 +33,7 @@ describe Projects::Ci::LintsController do before do project.add_guest(user) - get :show, namespace_id: project.namespace, project_id: project + get :show, params: { namespace_id: project.namespace, project_id: project } end it 'should respond with 404' do @@ -72,7 +72,7 @@ describe Projects::Ci::LintsController do WebMock.stub_request(:get, remote_file_path).to_return(body: remote_file_content) project.add_developer(user) - post :create, namespace_id: project.namespace, project_id: project, content: content + post :create, params: { namespace_id: project.namespace, project_id: project, content: content } end it 'should be success' do @@ -100,7 +100,7 @@ describe Projects::Ci::LintsController do before do project.add_developer(user) - post :create, namespace_id: project.namespace, project_id: project, content: content + post :create, params: { namespace_id: project.namespace, project_id: project, content: content } end it 'should assign errors' do @@ -112,7 +112,7 @@ describe Projects::Ci::LintsController do before do project.add_guest(user) - post :create, namespace_id: project.namespace, project_id: project, content: content + post :create, params: { namespace_id: project.namespace, project_id: project, content: content } end it 'should respond with 404' do diff --git a/spec/controllers/projects/clusters/applications_controller_spec.rb b/spec/controllers/projects/clusters/applications_controller_spec.rb index 8106453a775..cb558259225 100644 --- a/spec/controllers/projects/clusters/applications_controller_spec.rb +++ b/spec/controllers/projects/clusters/applications_controller_spec.rb @@ -81,7 +81,7 @@ describe Projects::Clusters::ApplicationsController do end def go - post :create, params.merge(namespace_id: project.namespace, project_id: project) + post :create, params: params.merge(namespace_id: project.namespace, project_id: project) end end end diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb index 483222363bb..ea266384446 100644 --- a/spec/controllers/projects/clusters_controller_spec.rb +++ b/spec/controllers/projects/clusters_controller_spec.rb @@ -18,7 +18,7 @@ describe Projects::ClustersController do describe 'GET index' do def go(params = {}) - get :index, params.reverse_merge(namespace_id: project.namespace.to_param, project_id: project) + get :index, params: params.reverse_merge(namespace_id: project.namespace.to_param, project_id: project) end describe 'functionality' do @@ -80,7 +80,7 @@ describe Projects::ClustersController do describe 'GET new' do def go - get :new, namespace_id: project.namespace, project_id: project + get :new, params: { namespace_id: project.namespace, project_id: project } end describe 'functionality for new cluster' do @@ -174,7 +174,7 @@ describe Projects::ClustersController do end def go - post :create_gcp, params.merge(namespace_id: project.namespace, project_id: project) + post :create_gcp, params: params.merge(namespace_id: project.namespace, project_id: project) end describe 'functionality' do @@ -261,7 +261,7 @@ describe Projects::ClustersController do end def go - post :create_user, params.merge(namespace_id: project.namespace, project_id: project) + post :create_user, params: params.merge(namespace_id: project.namespace, project_id: project) end describe 'functionality' do @@ -331,9 +331,11 @@ describe Projects::ClustersController do def go get :cluster_status, - namespace_id: project.namespace.to_param, - project_id: project.to_param, - id: cluster, + params: { + namespace_id: project.namespace.to_param, + project_id: project.to_param, + id: cluster + }, format: :json end @@ -369,9 +371,11 @@ describe Projects::ClustersController do def go get :show, - namespace_id: project.namespace, - project_id: project, - id: cluster + params: { + namespace_id: project.namespace, + project_id: project, + id: cluster + } end describe 'functionality' do @@ -397,11 +401,11 @@ describe Projects::ClustersController do describe 'PUT update' do def go(format: :html) - put :update, params.merge(namespace_id: project.namespace.to_param, - project_id: project.to_param, - id: cluster, - format: format - ) + put :update, params: params.merge(namespace_id: project.namespace.to_param, + project_id: project.to_param, + id: cluster, + format: format + ) end before do @@ -500,9 +504,11 @@ describe Projects::ClustersController do def go delete :destroy, - namespace_id: project.namespace, - project_id: project, - id: cluster + params: { + namespace_id: project.namespace, + project_id: project, + id: cluster + } end describe 'functionality' do diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb index e34fdee62d6..26eec90da06 100644 --- a/spec/controllers/projects/commit_controller_spec.rb +++ b/spec/controllers/projects/commit_controller_spec.rb @@ -21,7 +21,7 @@ describe Projects::CommitController do project_id: project } - get :show, params.merge(extra_params) + get :show, params: params.merge(extra_params) end context 'with valid id' do @@ -102,9 +102,11 @@ describe Projects::CommitController do it 'renders it' do get(:show, - namespace_id: fork_project.namespace, - project_id: fork_project, - id: commit.id) + params: { + namespace_id: fork_project.namespace, + project_id: fork_project, + id: commit.id + }) expect(response).to be_success end @@ -132,9 +134,11 @@ describe Projects::CommitController do commit = project.commit('5937ac0a7beb003549fc5fd26fc247adbce4a52e') get(:branches, - namespace_id: project.namespace, - project_id: project, - id: commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + id: commit.id + }) expect(assigns(:branches)).to include('master', 'feature_conflict') expect(assigns(:branches_limit_exceeded)).to be_falsey @@ -148,9 +152,11 @@ describe Projects::CommitController do allow_any_instance_of(Repository).to receive(:tag_count).and_return(1001) get(:branches, - namespace_id: project.namespace, - project_id: project, - id: commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + id: commit.id + }) expect(assigns(:branches)).to eq([]) expect(assigns(:branches_limit_exceeded)).to be_truthy @@ -163,9 +169,11 @@ describe Projects::CommitController do context 'when target branch is not provided' do it 'renders the 404 page' do post(:revert, - namespace_id: project.namespace, - project_id: project, - id: commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + id: commit.id + }) expect(response).not_to be_success expect(response).to have_gitlab_http_status(404) @@ -175,10 +183,12 @@ describe Projects::CommitController do context 'when the revert was successful' do it 'redirects to the commits page' do post(:revert, - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + start_branch: 'master', + id: commit.id + }) expect(response).to redirect_to project_commits_path(project, 'master') expect(flash[:notice]).to eq('The commit has been successfully reverted.') @@ -188,19 +198,23 @@ describe Projects::CommitController do context 'when the revert failed' do before do post(:revert, - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + start_branch: 'master', + id: commit.id + }) end it 'redirects to the commit page' do # Reverting a commit that has been already reverted. post(:revert, - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + start_branch: 'master', + id: commit.id + }) expect(response).to redirect_to project_commit_path(project, commit.id) expect(flash[:alert]).to match('Sorry, we cannot revert this commit automatically.') @@ -212,9 +226,11 @@ describe Projects::CommitController do context 'when target branch is not provided' do it 'renders the 404 page' do post(:cherry_pick, - namespace_id: project.namespace, - project_id: project, - id: master_pickable_commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + id: master_pickable_commit.id + }) expect(response).not_to be_success expect(response).to have_gitlab_http_status(404) @@ -224,10 +240,12 @@ describe Projects::CommitController do context 'when the cherry-pick was successful' do it 'redirects to the commits page' do post(:cherry_pick, - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: master_pickable_commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + start_branch: 'master', + id: master_pickable_commit.id + }) expect(response).to redirect_to project_commits_path(project, 'master') expect(flash[:notice]).to eq('The commit has been successfully cherry-picked into master.') @@ -237,19 +255,23 @@ describe Projects::CommitController do context 'when the cherry_pick failed' do before do post(:cherry_pick, - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: master_pickable_commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + start_branch: 'master', + id: master_pickable_commit.id + }) end it 'redirects to the commit page' do # Cherry-picking a commit that has been already cherry-picked. post(:cherry_pick, - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: master_pickable_commit.id) + params: { + namespace_id: project.namespace, + project_id: project, + start_branch: 'master', + id: master_pickable_commit.id + }) expect(response).to redirect_to project_commit_path(project, master_pickable_commit.id) expect(flash[:alert]).to match('Sorry, we cannot cherry-pick this commit automatically.') @@ -264,7 +286,7 @@ describe Projects::CommitController do project_id: project } - get :diff_for_path, params.merge(extra_params) + get :diff_for_path, params: params.merge(extra_params) end let(:existing_path) { '.gitmodules' } @@ -332,7 +354,7 @@ describe Projects::CommitController do project_id: project } - get :pipelines, params.merge(extra_params) + get :pipelines, params: params.merge(extra_params) end context 'when the commit exists' do diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb index 80513650636..8cb9130b834 100644 --- a/spec/controllers/projects/commits_controller_spec.rb +++ b/spec/controllers/projects/commits_controller_spec.rb @@ -17,8 +17,10 @@ describe Projects::CommitsController do context "no ref is provided" do it 'should redirect to the default branch of the project' do get(:commits_root, - namespace_id: project.namespace, - project_id: project) + params: { + namespace_id: project.namespace, + project_id: project + }) expect(response).to redirect_to project_commits_path(project) end @@ -31,9 +33,11 @@ describe Projects::CommitsController do context 'with file path' do before do get(:show, - namespace_id: project.namespace, - project_id: project, - id: id) + params: { + namespace_id: project.namespace, + project_id: project, + id: id + }) end context "valid branch, valid file" do @@ -65,9 +69,11 @@ describe Projects::CommitsController do context "when the ref does not exist with the suffix" do before do get(:show, - namespace_id: project.namespace, - project_id: project, - id: "master.atom") + params: { + namespace_id: project.namespace, + project_id: project, + id: "master.atom" + }) end it "renders as atom" do @@ -88,9 +94,11 @@ describe Projects::CommitsController do allow_any_instance_of(Repository).to receive(:commit).with('master.atom').and_return(commit) get(:show, - namespace_id: project.namespace, - project_id: project, - id: "master.atom") + params: { + namespace_id: project.namespace, + project_id: project, + id: "master.atom" + }) end it "renders as HTML" do @@ -106,9 +114,11 @@ describe Projects::CommitsController do before do get(:signatures, - namespace_id: project.namespace, - project_id: project, - id: id, + params: { + namespace_id: project.namespace, + project_id: project, + id: id + }, format: :json) end diff --git a/spec/controllers/projects/compare_controller_spec.rb b/spec/controllers/projects/compare_controller_spec.rb index 17883d0fadd..cfd70e93efb 100644 --- a/spec/controllers/projects/compare_controller_spec.rb +++ b/spec/controllers/projects/compare_controller_spec.rb @@ -13,7 +13,7 @@ describe Projects::CompareController do render_views before do - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } end it 'returns successfully' do @@ -24,7 +24,7 @@ describe Projects::CompareController do describe 'GET show' do render_views - subject(:show_request) { get :show, request_params } + subject(:show_request) { get :show, params: request_params } let(:request_params) do { @@ -130,7 +130,7 @@ describe Projects::CompareController do project_id: project } - get :diff_for_path, params.merge(extra_params) + get :diff_for_path, params: params.merge(extra_params) end let(:existing_path) { 'files/ruby/feature.rb' } @@ -201,7 +201,7 @@ describe Projects::CompareController do end describe 'POST create' do - subject(:create_request) { post :create, request_params } + subject(:create_request) { post :create, params: request_params } let(:request_params) do { @@ -260,7 +260,7 @@ describe Projects::CompareController do end describe 'GET signatures' do - subject(:signatures_request) { get :signatures, request_params } + subject(:signatures_request) { get :signatures, params: request_params } let(:request_params) do { diff --git a/spec/controllers/projects/cycle_analytics_controller_spec.rb b/spec/controllers/projects/cycle_analytics_controller_spec.rb index 5c79269e8f1..6a63cbdf8e2 100644 --- a/spec/controllers/projects/cycle_analytics_controller_spec.rb +++ b/spec/controllers/projects/cycle_analytics_controller_spec.rb @@ -13,8 +13,10 @@ describe Projects::CycleAnalyticsController do context 'with no data' do it 'is true' do get(:show, - namespace_id: project.namespace, - project_id: project) + params: { + namespace_id: project.namespace, + project_id: project + }) expect(response).to be_success expect(assigns(:cycle_analytics_no_data)).to eq(true) @@ -32,8 +34,10 @@ describe Projects::CycleAnalyticsController do it 'is false' do get(:show, - namespace_id: project.namespace, - project_id: project) + params: { + namespace_id: project.namespace, + project_id: project + }) expect(response).to be_success expect(assigns(:cycle_analytics_no_data)).to eq(false) diff --git a/spec/controllers/projects/deploy_keys_controller_spec.rb b/spec/controllers/projects/deploy_keys_controller_spec.rb index 4567a51b88e..a927d4329ef 100644 --- a/spec/controllers/projects/deploy_keys_controller_spec.rb +++ b/spec/controllers/projects/deploy_keys_controller_spec.rb @@ -17,7 +17,7 @@ describe Projects::DeployKeysController do context 'when html requested' do it 'redirects to blob' do - get :index, params + get :index, params: params expect(response).to redirect_to(project_settings_repository_path(project, anchor: 'js-deploy-keys-settings')) end @@ -48,7 +48,7 @@ describe Projects::DeployKeysController do end it 'returns json in a correct format' do - get :index, params.merge(format: :json) + get :index, params: params.merge(format: :json) json = JSON.parse(response.body) @@ -74,7 +74,7 @@ describe Projects::DeployKeysController do it 'redirects to login' do expect do - put :enable, id: deploy_key.id, namespace_id: project.namespace, project_id: project + put :enable, params: { id: deploy_key.id, namespace_id: project.namespace, project_id: project } end.not_to change { DeployKeysProject.count } expect(response).to have_http_status(302) @@ -89,7 +89,7 @@ describe Projects::DeployKeysController do it 'returns 404' do expect do - put :enable, id: deploy_key.id, namespace_id: project.namespace, project_id: project + put :enable, params: { id: deploy_key.id, namespace_id: project.namespace, project_id: project } end.not_to change { DeployKeysProject.count } expect(response).to have_http_status(404) @@ -103,7 +103,7 @@ describe Projects::DeployKeysController do it 'returns 302' do expect do - put :enable, id: deploy_key.id, namespace_id: project.namespace, project_id: project + put :enable, params: { id: deploy_key.id, namespace_id: project.namespace, project_id: project } end.to change { DeployKeysProject.count }.by(1) expect(DeployKeysProject.where(project_id: project.id, deploy_key_id: deploy_key.id).count).to eq(1) @@ -112,7 +112,7 @@ describe Projects::DeployKeysController do end it 'returns 404' do - put :enable, id: 0, namespace_id: project.namespace, project_id: project + put :enable, params: { id: 0, namespace_id: project.namespace, project_id: project } expect(response).to have_http_status(404) end @@ -125,7 +125,7 @@ describe Projects::DeployKeysController do it 'returns 302' do expect do - put :enable, id: deploy_key.id, namespace_id: project.namespace, project_id: project + put :enable, params: { id: deploy_key.id, namespace_id: project.namespace, project_id: project } end.to change { DeployKeysProject.count }.by(1) expect(DeployKeysProject.where(project_id: project.id, deploy_key_id: deploy_key.id).count).to eq(1) @@ -145,7 +145,7 @@ describe Projects::DeployKeysController do end it 'redirects to login' do - put :disable, id: deploy_key.id, namespace_id: project.namespace, project_id: project + put :disable, params: { id: deploy_key.id, namespace_id: project.namespace, project_id: project } expect(response).to have_http_status(302) expect(response).to redirect_to(new_user_session_path) @@ -159,7 +159,7 @@ describe Projects::DeployKeysController do end it 'returns 404' do - put :disable, id: deploy_key.id, namespace_id: project.namespace, project_id: project + put :disable, params: { id: deploy_key.id, namespace_id: project.namespace, project_id: project } expect(response).to have_http_status(404) expect(DeployKey.find(deploy_key.id)).to eq(deploy_key) @@ -168,7 +168,7 @@ describe Projects::DeployKeysController do context 'with user with permission' do it 'returns 302' do - put :disable, id: deploy_key.id, namespace_id: project.namespace, project_id: project + put :disable, params: { id: deploy_key.id, namespace_id: project.namespace, project_id: project } expect(response).to have_http_status(302) expect(response).to redirect_to(namespace_project_settings_repository_path(anchor: 'js-deploy-keys-settings')) @@ -177,7 +177,7 @@ describe Projects::DeployKeysController do end it 'returns 404' do - put :disable, id: 0, namespace_id: project.namespace, project_id: project + put :disable, params: { id: 0, namespace_id: project.namespace, project_id: project } expect(response).to have_http_status(404) end @@ -190,7 +190,7 @@ describe Projects::DeployKeysController do it 'returns 302' do expect do - put :disable, id: deploy_key.id, namespace_id: project.namespace, project_id: project + put :disable, params: { id: deploy_key.id, namespace_id: project.namespace, project_id: project } end.to change { DeployKey.count }.by(-1) expect(response).to have_http_status(302) diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb index 5b7da81b6a1..5c33098fd31 100644 --- a/spec/controllers/projects/deployments_controller_spec.rb +++ b/spec/controllers/projects/deployments_controller_spec.rb @@ -19,7 +19,7 @@ describe Projects::DeploymentsController do create(:deployment, :success, environment: environment, created_at: 7.hours.ago) create(:deployment, :success, environment: environment) - get :index, deployment_params(after: 8.hours.ago) + get :index, params: deployment_params(after: 8.hours.ago) expect(response).to be_ok @@ -29,7 +29,7 @@ describe Projects::DeploymentsController do it 'returns a list with deployments information' do create(:deployment, :success, environment: environment) - get :index, deployment_params + get :index, params: deployment_params expect(response).to be_ok expect(response).to match_response_schema('deployments') @@ -49,7 +49,7 @@ describe Projects::DeploymentsController do end it 'responds with not found' do - get :metrics, deployment_params(id: deployment.id) + get :metrics, params: deployment_params(id: deployment.id) expect(response).to be_not_found end @@ -66,7 +66,7 @@ describe Projects::DeploymentsController do end it 'returns a empty response 204 resposne' do - get :metrics, deployment_params(id: deployment.id) + get :metrics, params: deployment_params(id: deployment.id) expect(response).to have_gitlab_http_status(204) expect(response.body).to eq('') end @@ -86,7 +86,7 @@ describe Projects::DeploymentsController do end it 'returns a metrics JSON document' do - get :metrics, deployment_params(id: deployment.id) + get :metrics, params: deployment_params(id: deployment.id) expect(response).to be_ok expect(json_response['success']).to be(true) @@ -101,7 +101,7 @@ describe Projects::DeploymentsController do end it 'responds with not found' do - get :metrics, deployment_params(id: deployment.id) + get :metrics, params: deployment_params(id: deployment.id) expect(response).to be_not_found end @@ -122,7 +122,7 @@ describe Projects::DeploymentsController do end it 'responds with not found' do - get :metrics, deployment_params(id: deployment.id) + get :metrics, params: deployment_params(id: deployment.id) expect(response).to be_not_found end @@ -141,7 +141,7 @@ describe Projects::DeploymentsController do end it 'returns a empty response 204 response' do - get :additional_metrics, deployment_params(id: deployment.id, format: :json) + get :additional_metrics, params: deployment_params(id: deployment.id, format: :json) expect(response).to have_gitlab_http_status(204) expect(response.body).to eq('') end @@ -161,7 +161,7 @@ describe Projects::DeploymentsController do end it 'returns a metrics JSON document' do - get :additional_metrics, deployment_params(id: deployment.id, format: :json) + get :additional_metrics, params: deployment_params(id: deployment.id, format: :json) expect(response).to be_ok expect(json_response['success']).to be(true) diff --git a/spec/controllers/projects/discussions_controller_spec.rb b/spec/controllers/projects/discussions_controller_spec.rb index 4aa33dbbb01..0b9f336cf13 100644 --- a/spec/controllers/projects/discussions_controller_spec.rb +++ b/spec/controllers/projects/discussions_controller_spec.rb @@ -23,7 +23,7 @@ describe Projects::DiscussionsController do context 'when user is not authorized to read the MR' do it 'returns 404' do - get :show, request_params, format: :json + get :show, params: request_params, session: { format: :json } expect(response).to have_gitlab_http_status(404) end @@ -35,7 +35,7 @@ describe Projects::DiscussionsController do end it 'returns status 200' do - get :show, request_params, format: :json + get :show, params: request_params, session: { format: :json } expect(response).to have_gitlab_http_status(200) end @@ -43,7 +43,7 @@ describe Projects::DiscussionsController do it 'returns status 404 if MR does not exists' do merge_request.destroy! - get :show, request_params, format: :json + get :show, params: request_params, session: { format: :json } expect(response).to have_gitlab_http_status(404) end @@ -56,7 +56,7 @@ describe Projects::DiscussionsController do end it 'returns status 200' do - get :show, request_params, format: :json + get :show, params: request_params, session: { format: :json } expect(response).to have_gitlab_http_status(200) end @@ -70,7 +70,7 @@ describe Projects::DiscussionsController do context "when the user is not authorized to resolve the discussion" do it "returns status 404" do - post :resolve, request_params + post :resolve, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -87,7 +87,7 @@ describe Projects::DiscussionsController do end it "returns status 404" do - post :resolve, request_params + post :resolve, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -95,7 +95,7 @@ describe Projects::DiscussionsController do context "when the discussion is resolvable" do it "resolves the discussion" do - post :resolve, request_params + post :resolve, params: request_params expect(note.reload.discussion.resolved?).to be true expect(note.reload.discussion.resolved_by).to eq(user) @@ -104,17 +104,17 @@ describe Projects::DiscussionsController do it "sends notifications if all discussions are resolved" do expect_any_instance_of(MergeRequests::ResolvedDiscussionNotificationService).to receive(:execute).with(merge_request) - post :resolve, request_params + post :resolve, params: request_params end it "returns the name of the resolving user" do - post :resolve, request_params + post :resolve, params: request_params expect(JSON.parse(response.body)['resolved_by']['name']).to eq(user.name) end it "returns status 200" do - post :resolve, request_params + post :resolve, params: request_params expect(response).to have_gitlab_http_status(200) end @@ -123,7 +123,7 @@ describe Projects::DiscussionsController do expect_any_instance_of(DiscussionSerializer).to receive(:represent) .with(instance_of(Discussion), { context: instance_of(described_class), render_truncated_diff_lines: true }) - post :resolve, request_params + post :resolve, params: request_params end context 'diff discussion' do @@ -131,7 +131,7 @@ describe Projects::DiscussionsController do let(:discussion) { note.discussion } it "returns truncated diff lines" do - post :resolve, request_params + post :resolve, params: request_params expect(JSON.parse(response.body)['truncated_diff_lines']).to be_present end @@ -149,7 +149,7 @@ describe Projects::DiscussionsController do context "when the user is not authorized to resolve the discussion" do it "returns status 404" do - delete :unresolve, request_params + delete :unresolve, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -166,7 +166,7 @@ describe Projects::DiscussionsController do end it "returns status 404" do - delete :unresolve, request_params + delete :unresolve, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -174,13 +174,13 @@ describe Projects::DiscussionsController do context "when the discussion is resolvable" do it "unresolves the discussion" do - delete :unresolve, request_params + delete :unresolve, params: request_params expect(note.reload.discussion.resolved?).to be false end it "returns status 200" do - delete :unresolve, request_params + delete :unresolve, params: request_params expect(response).to have_gitlab_http_status(200) end @@ -194,7 +194,7 @@ describe Projects::DiscussionsController do expect_any_instance_of(DiscussionSerializer).to receive(:represent) .with(instance_of(Discussion), { context: instance_of(described_class), render_truncated_diff_lines: true }) - delete :unresolve, request_params + delete :unresolve, params: request_params end end end diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index 5fa0488014f..94fb85f217c 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -17,7 +17,7 @@ describe Projects::EnvironmentsController do describe 'GET index' do context 'when a request for the HTML is made' do it 'responds with status code 200' do - get :index, environment_params + get :index, params: environment_params expect(response).to have_gitlab_http_status(:ok) end @@ -26,7 +26,7 @@ describe Projects::EnvironmentsController do expect_any_instance_of(Gitlab::EtagCaching::Store) .to receive(:touch).with(project_environments_path(project, format: :json)) - get :index, environment_params + get :index, params: environment_params end end @@ -49,7 +49,7 @@ describe Projects::EnvironmentsController do context 'when requesting available environments scope' do before do - get :index, environment_params(format: :json, scope: :available) + get :index, params: environment_params(format: :json, scope: :available) end it 'responds with a payload describing available environments' do @@ -73,7 +73,7 @@ describe Projects::EnvironmentsController do context 'when requesting stopped environments scope' do before do - get :index, environment_params(format: :json, scope: :stopped) + get :index, params: environment_params(format: :json, scope: :stopped) end it 'responds with a payload describing stopped environments' do @@ -103,9 +103,11 @@ describe Projects::EnvironmentsController do context 'when using default format' do it 'responds with HTML' do - get :folder, namespace_id: project.namespace, - project_id: project, - id: 'staging-1.0' + get :folder, params: { + namespace_id: project.namespace, + project_id: project, + id: 'staging-1.0' + } expect(response).to be_ok expect(response).to render_template 'folder' @@ -114,9 +116,11 @@ describe Projects::EnvironmentsController do context 'when using JSON format' do it 'sorts the subfolders lexicographically' do - get :folder, namespace_id: project.namespace, - project_id: project, - id: 'staging-1.0', + get :folder, params: { + namespace_id: project.namespace, + project_id: project, + id: 'staging-1.0' + }, format: :json expect(response).to be_ok @@ -132,7 +136,7 @@ describe Projects::EnvironmentsController do describe 'GET show' do context 'with valid id' do it 'responds with a status code 200' do - get :show, environment_params + get :show, params: environment_params expect(response).to be_ok end @@ -142,7 +146,7 @@ describe Projects::EnvironmentsController do it 'responds with a status code 404' do params = environment_params params[:id] = 12345 - get :show, params + get :show, params: params expect(response).to have_gitlab_http_status(404) end @@ -151,7 +155,7 @@ describe Projects::EnvironmentsController do describe 'GET edit' do it 'responds with a status code 200' do - get :edit, environment_params + get :edit, params: environment_params expect(response).to be_ok end @@ -160,7 +164,7 @@ describe Projects::EnvironmentsController do describe 'PATCH #update' do it 'responds with a 302' do patch_params = environment_params.merge(environment: { external_url: 'https://git.gitlab.com' }) - patch :update, patch_params + patch :update, params: patch_params expect(response).to have_gitlab_http_status(302) end @@ -171,7 +175,7 @@ describe Projects::EnvironmentsController do it 'returns 404' do allow_any_instance_of(Environment).to receive(:available?) { false } - patch :stop, environment_params(format: :json) + patch :stop, params: environment_params(format: :json) expect(response).to have_gitlab_http_status(404) end @@ -184,7 +188,7 @@ describe Projects::EnvironmentsController do allow_any_instance_of(Environment) .to receive_messages(available?: true, stop_with_action!: action) - patch :stop, environment_params(format: :json) + patch :stop, params: environment_params(format: :json) expect(response).to have_gitlab_http_status(200) expect(json_response).to eq( @@ -198,7 +202,7 @@ describe Projects::EnvironmentsController do allow_any_instance_of(Environment) .to receive_messages(available?: true, stop_with_action!: nil) - patch :stop, environment_params(format: :json) + patch :stop, params: environment_params(format: :json) expect(response).to have_gitlab_http_status(200) expect(json_response).to eq( @@ -211,7 +215,7 @@ describe Projects::EnvironmentsController do describe 'GET #terminal' do context 'with valid id' do it 'responds with a status code 200' do - get :terminal, environment_params + get :terminal, params: environment_params expect(response).to have_gitlab_http_status(200) end @@ -222,13 +226,13 @@ describe Projects::EnvironmentsController do expect_any_instance_of(defined?(EE) ? EE::Environment : Environment) .to receive(:terminals) - get :terminal, environment_params + get :terminal, params: environment_params end end context 'with invalid id' do it 'responds with a status code 404' do - get :terminal, environment_params(id: 666) + get :terminal, params: environment_params(id: 666) expect(response).to have_gitlab_http_status(404) end @@ -254,7 +258,7 @@ describe Projects::EnvironmentsController do .with(:fake_terminal) .and_return(workhorse: :response) - get :terminal_websocket_authorize, environment_params + get :terminal_websocket_authorize, params: environment_params expect(response).to have_gitlab_http_status(200) expect(response.headers["Content-Type"]).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE) @@ -264,7 +268,7 @@ describe Projects::EnvironmentsController do context 'and invalid id' do it 'returns 404' do - get :terminal_websocket_authorize, environment_params(id: 666) + get :terminal_websocket_authorize, params: environment_params(id: 666) expect(response).to have_gitlab_http_status(404) end @@ -275,7 +279,7 @@ describe Projects::EnvironmentsController do it 'aborts with an exception' do allow(Gitlab::Workhorse).to receive(:verify_api_request!).and_raise(JWT::DecodeError) - expect { get :terminal_websocket_authorize, environment_params }.to raise_error(JWT::DecodeError) + expect { get :terminal_websocket_authorize, params: environment_params }.to raise_error(JWT::DecodeError) # controller tests don't set the response status correctly. It's enough # to check that the action raised an exception end @@ -288,13 +292,13 @@ describe Projects::EnvironmentsController do it 'redirects to environment if it exists' do environment = create(:environment, name: 'production', project: project) - get :metrics_redirect, namespace_id: project.namespace, project_id: project + get :metrics_redirect, params: { namespace_id: project.namespace, project_id: project } expect(response).to redirect_to(environment_metrics_path(environment)) end it 'redirects to empty page if no environment exists' do - get :metrics_redirect, namespace_id: project.namespace, project_id: project + get :metrics_redirect, params: { namespace_id: project.namespace, project_id: project } expect(response).to be_ok expect(response).to render_template 'empty' @@ -312,14 +316,14 @@ describe Projects::EnvironmentsController do end it 'returns a metrics page' do - get :metrics, environment_params + get :metrics, params: environment_params expect(response).to be_ok end context 'when requesting metrics as JSON' do it 'returns a metrics JSON document' do - get :metrics, environment_params(format: :json) + get :metrics, params: environment_params(format: :json) expect(response).to have_gitlab_http_status(204) expect(json_response).to eq({}) @@ -337,7 +341,7 @@ describe Projects::EnvironmentsController do end it 'returns a metrics JSON document' do - get :metrics, environment_params(format: :json) + get :metrics, params: environment_params(format: :json) expect(response).to be_ok expect(json_response['success']).to be(true) @@ -359,7 +363,7 @@ describe Projects::EnvironmentsController do context 'when requesting metrics as JSON' do it 'returns a metrics JSON document' do - get :additional_metrics, environment_params(format: :json) + get :additional_metrics, params: environment_params(format: :json) expect(response).to have_gitlab_http_status(204) expect(json_response).to eq({}) @@ -379,7 +383,7 @@ describe Projects::EnvironmentsController do end it 'returns a metrics JSON document' do - get :additional_metrics, environment_params(format: :json) + get :additional_metrics, params: environment_params(format: :json) expect(response).to be_ok expect(json_response['success']).to be(true) diff --git a/spec/controllers/projects/find_file_controller_spec.rb b/spec/controllers/projects/find_file_controller_spec.rb index 66fe41108e2..9072d67af07 100644 --- a/spec/controllers/projects/find_file_controller_spec.rb +++ b/spec/controllers/projects/find_file_controller_spec.rb @@ -17,9 +17,11 @@ describe Projects::FindFileController do before do get(:show, - namespace_id: project.namespace, - project_id: project, - id: id) + params: { + namespace_id: project.namespace, + project_id: project, + id: id + }) end context "valid branch" do @@ -36,9 +38,11 @@ describe Projects::FindFileController do describe "GET #list" do def go(format: 'json') get :list, - namespace_id: project.namespace, - project_id: project, - id: id, + params: { + namespace_id: project.namespace, + project_id: project, + id: id + }, format: format end diff --git a/spec/controllers/projects/forks_controller_spec.rb b/spec/controllers/projects/forks_controller_spec.rb index 945b6142abf..0e1663c8585 100644 --- a/spec/controllers/projects/forks_controller_spec.rb +++ b/spec/controllers/projects/forks_controller_spec.rb @@ -13,8 +13,10 @@ describe Projects::ForksController do describe 'GET index' do def get_forks get :index, - namespace_id: project.namespace, - project_id: project + params: { + namespace_id: project.namespace, + project_id: project + } end context 'when fork is public' do @@ -83,8 +85,10 @@ describe Projects::ForksController do describe 'GET new' do def get_new get :new, - namespace_id: project.namespace, - project_id: project + params: { + namespace_id: project.namespace, + project_id: project + } end context 'when user is signed in' do @@ -111,9 +115,11 @@ describe Projects::ForksController do describe 'POST create' do def post_create post :create, - namespace_id: project.namespace, - project_id: project, - namespace_key: user.namespace.id + params: { + namespace_id: project.namespace, + project_id: project, + namespace_key: user.namespace.id + } end context 'when user is signed in' do diff --git a/spec/controllers/projects/graphs_controller_spec.rb b/spec/controllers/projects/graphs_controller_spec.rb index da78592a6f6..73fb7307e11 100644 --- a/spec/controllers/projects/graphs_controller_spec.rb +++ b/spec/controllers/projects/graphs_controller_spec.rb @@ -11,7 +11,7 @@ describe Projects::GraphsController do describe 'GET languages' do it "redirects_to action charts" do - get(:commits, namespace_id: project.namespace.path, project_id: project.path, id: 'master') + get(:commits, params: { namespace_id: project.namespace.path, project_id: project.path, id: 'master' }) expect(response).to redirect_to action: :charts end @@ -19,7 +19,7 @@ describe Projects::GraphsController do describe 'GET commits' do it "redirects_to action charts" do - get(:commits, namespace_id: project.namespace.path, project_id: project.path, id: 'master') + get(:commits, params: { namespace_id: project.namespace.path, project_id: project.path, id: 'master' }) expect(response).to redirect_to action: :charts end diff --git a/spec/controllers/projects/group_links_controller_spec.rb b/spec/controllers/projects/group_links_controller_spec.rb index 879aff26deb..675eeff8d12 100644 --- a/spec/controllers/projects/group_links_controller_spec.rb +++ b/spec/controllers/projects/group_links_controller_spec.rb @@ -14,10 +14,12 @@ describe Projects::GroupLinksController do describe '#create' do shared_context 'link project to group' do before do - post(:create, namespace_id: project.namespace, - project_id: project, - link_group_id: group.id, - link_group_access: ProjectGroupLink.default_access) + post(:create, params: { + namespace_id: project.namespace, + project_id: project, + link_group_id: group.id, + link_group_access: ProjectGroupLink.default_access + }) end end @@ -65,10 +67,12 @@ describe Projects::GroupLinksController do context 'when project group id equal link group id' do before do - post(:create, namespace_id: project.namespace, - project_id: project, - link_group_id: group2.id, - link_group_access: ProjectGroupLink.default_access) + post(:create, params: { + namespace_id: project.namespace, + project_id: project, + link_group_id: group2.id, + link_group_access: ProjectGroupLink.default_access + }) end it 'does not share project with selected group' do @@ -84,9 +88,11 @@ describe Projects::GroupLinksController do context 'when link group id is not present' do before do - post(:create, namespace_id: project.namespace, - project_id: project, - link_group_access: ProjectGroupLink.default_access) + post(:create, params: { + namespace_id: project.namespace, + project_id: project, + link_group_access: ProjectGroupLink.default_access + }) end it 'redirects to project group links page' do diff --git a/spec/controllers/projects/hooks_controller_spec.rb b/spec/controllers/projects/hooks_controller_spec.rb index 7d3a8c3d0d3..3037c922b68 100644 --- a/spec/controllers/projects/hooks_controller_spec.rb +++ b/spec/controllers/projects/hooks_controller_spec.rb @@ -11,7 +11,7 @@ describe Projects::HooksController do describe '#index' do it 'redirects to settings/integrations page' do - get(:index, namespace_id: project.namespace, project_id: project) + get(:index, params: { namespace_id: project.namespace, project_id: project }) expect(response).to redirect_to( project_settings_integrations_path(project) @@ -38,7 +38,7 @@ describe Projects::HooksController do wiki_page_events: true } - post :create, namespace_id: project.namespace, project_id: project, hook: hook_params + post :create, params: { namespace_id: project.namespace, project_id: project, hook: hook_params } expect(response).to have_http_status(302) expect(ProjectHook.all.size).to eq(1) diff --git a/spec/controllers/projects/imports_controller_spec.rb b/spec/controllers/projects/imports_controller_spec.rb index cdc63f5aab3..3ebfe4b0918 100644 --- a/spec/controllers/projects/imports_controller_spec.rb +++ b/spec/controllers/projects/imports_controller_spec.rb @@ -12,13 +12,13 @@ describe Projects::ImportsController do describe 'GET #show' do context 'when repository does not exists' do it 'renders template' do - get :show, namespace_id: project.namespace.to_param, project_id: project + get :show, params: { namespace_id: project.namespace.to_param, project_id: project } expect(response).to render_template :show end it 'sets flash.now if params is present' do - get :show, namespace_id: project.namespace.to_param, project_id: project, continue: { to: '/', notice_now: 'Started' } + get :show, params: { namespace_id: project.namespace.to_param, project_id: project, continue: { to: '/', notice_now: 'Started' } } expect(flash.now[:notice]).to eq 'Started' end @@ -34,13 +34,13 @@ describe Projects::ImportsController do end it 'renders template' do - get :show, namespace_id: project.namespace.to_param, project_id: project + get :show, params: { namespace_id: project.namespace.to_param, project_id: project } expect(response).to render_template :show end it 'sets flash.now if params is present' do - get :show, namespace_id: project.namespace.to_param, project_id: project, continue: { to: '/', notice_now: 'In progress' } + get :show, params: { namespace_id: project.namespace.to_param, project_id: project, continue: { to: '/', notice_now: 'In progress' } } expect(flash.now[:notice]).to eq 'In progress' end @@ -52,7 +52,7 @@ describe Projects::ImportsController do end it 'redirects to new_namespace_project_import_path' do - get :show, namespace_id: project.namespace.to_param, project_id: project + get :show, params: { namespace_id: project.namespace.to_param, project_id: project } expect(response).to redirect_to new_project_import_path(project) end @@ -67,7 +67,7 @@ describe Projects::ImportsController do it 'redirects to namespace_project_path' do allow_any_instance_of(Project).to receive(:forked?).and_return(true) - get :show, namespace_id: project.namespace.to_param, project_id: project + get :show, params: { namespace_id: project.namespace.to_param, project_id: project } expect(flash[:notice]).to eq 'The project was successfully forked.' expect(response).to redirect_to project_path(project) @@ -76,7 +76,7 @@ describe Projects::ImportsController do context 'when project is external' do it 'redirects to namespace_project_path' do - get :show, namespace_id: project.namespace.to_param, project_id: project + get :show, params: { namespace_id: project.namespace.to_param, project_id: project } expect(flash[:notice]).to eq 'The project was successfully imported.' expect(response).to redirect_to project_path(project) @@ -92,7 +92,7 @@ describe Projects::ImportsController do end it 'redirects to internal params[:to]' do - get :show, namespace_id: project.namespace.to_param, project_id: project, continue: params + get :show, params: { namespace_id: project.namespace.to_param, project_id: project, continue: params } expect(flash[:notice]).to eq params[:notice] expect(response).to redirect_to params[:to] @@ -101,7 +101,7 @@ describe Projects::ImportsController do it 'does not redirect to external params[:to]' do params[:to] = "//google.com" - get :show, namespace_id: project.namespace.to_param, project_id: project, continue: params + get :show, params: { namespace_id: project.namespace.to_param, project_id: project, continue: params } expect(response).not_to redirect_to params[:to] end end @@ -113,7 +113,7 @@ describe Projects::ImportsController do end it 'redirects to namespace_project_path' do - get :show, namespace_id: project.namespace.to_param, project_id: project + get :show, params: { namespace_id: project.namespace.to_param, project_id: project } expect(response).to redirect_to project_path(project) end diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index 6240ab6d867..f9193513a6a 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -18,7 +18,7 @@ describe Projects::IssuesController do project.issues_enabled = false project.save! - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(404) end @@ -26,7 +26,7 @@ describe Projects::IssuesController do context 'when GitLab issues enabled' do it 'renders the "index" template' do - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(200) expect(response).to render_template(:index) @@ -45,13 +45,13 @@ describe Projects::IssuesController do it_behaves_like 'set sort order from user preference' it "returns index" do - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(200) end it "returns 301 if request path doesn't match project path" do - get :index, namespace_id: project.namespace, project_id: project.path.upcase + get :index, params: { namespace_id: project.namespace, project_id: project.path.upcase } expect(response).to redirect_to(project_issues_path(project)) end @@ -60,7 +60,7 @@ describe Projects::IssuesController do project.issues_enabled = false project.save! - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(404) end end @@ -77,18 +77,22 @@ describe Projects::IssuesController do it 'redirects to last_page if page number is larger than number of pages' do get :index, - namespace_id: project.namespace.to_param, - project_id: project, - page: (last_page + 1).to_param + params: { + namespace_id: project.namespace.to_param, + project_id: project, + page: (last_page + 1).to_param + } expect(response).to redirect_to(namespace_project_issues_path(page: last_page, state: controller.params[:state], scope: controller.params[:scope])) end it 'redirects to specified page' do get :index, - namespace_id: project.namespace.to_param, - project_id: project, - page: last_page.to_param + params: { + namespace_id: project.namespace.to_param, + project_id: project, + page: last_page.to_param + } expect(assigns(:issues).current_page).to eq(last_page) expect(response).to have_gitlab_http_status(200) @@ -97,10 +101,12 @@ describe Projects::IssuesController do it 'does not redirect to external sites when provided a host field' do external_host = "www.example.com" get :index, - namespace_id: project.namespace.to_param, - project_id: project, - page: (last_page + 1).to_param, - host: external_host + params: { + namespace_id: project.namespace.to_param, + project_id: project, + page: (last_page + 1).to_param, + host: external_host + } expect(response).to redirect_to(namespace_project_issues_path(page: last_page, state: controller.params[:state], scope: controller.params[:scope])) end @@ -109,9 +115,11 @@ describe Projects::IssuesController do allow(controller).to receive(:pagination_disabled?).and_return(true) get :index, - namespace_id: project.namespace.to_param, - project_id: project, - page: (last_page + 1).to_param + params: { + namespace_id: project.namespace.to_param, + project_id: project, + page: (last_page + 1).to_param + } expect(response).to have_gitlab_http_status(200) expect(assigns(:issues).size).to eq(2) @@ -121,7 +129,7 @@ describe Projects::IssuesController do describe 'GET #new' do it 'redirects to signin if not logged in' do - get :new, namespace_id: project.namespace, project_id: project + get :new, params: { namespace_id: project.namespace, project_id: project } expect(flash[:notice]).to eq 'Please sign in to create the new issue.' expect(response).to redirect_to(new_user_session_path) @@ -134,7 +142,7 @@ describe Projects::IssuesController do end it 'builds a new issue' do - get :new, namespace_id: project.namespace, project_id: project + get :new, params: { namespace_id: project.namespace, project_id: project } expect(assigns(:issue)).to be_a_new(Issue) end @@ -144,7 +152,7 @@ describe Projects::IssuesController do project_with_repository.add_developer(user) mr = create(:merge_request_with_diff_notes, source_project: project_with_repository) - get :new, namespace_id: project_with_repository.namespace, project_id: project_with_repository, merge_request_to_resolve_discussions_of: mr.iid + get :new, params: { namespace_id: project_with_repository.namespace, project_id: project_with_repository, merge_request_to_resolve_discussions_of: mr.iid } expect(assigns(:issue).title).not_to be_empty expect(assigns(:issue).description).not_to be_empty @@ -153,7 +161,7 @@ describe Projects::IssuesController do it 'fills in an issue for a discussion' do note = create(:note_on_merge_request, project: project) - get :new, namespace_id: project.namespace.path, project_id: project, merge_request_to_resolve_discussions_of: note.noteable.iid, discussion_to_resolve: note.discussion_id + get :new, params: { namespace_id: project.namespace.path, project_id: project, merge_request_to_resolve_discussions_of: note.noteable.iid, discussion_to_resolve: note.discussion_id } expect(assigns(:issue).title).not_to be_empty expect(assigns(:issue).description).not_to be_empty @@ -178,7 +186,7 @@ describe Projects::IssuesController do project.issues_enabled = false project.save! - get :new, namespace_id: project.namespace, project_id: project + get :new, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(404) end @@ -186,7 +194,7 @@ describe Projects::IssuesController do context 'when GitLab issues enabled' do it 'renders the "new" template' do - get :new, namespace_id: project.namespace, project_id: project + get :new, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(200) expect(response).to render_template(:new) @@ -212,9 +220,11 @@ describe Projects::IssuesController do context 'without an AJAX request' do it 'stores the visited URL' do get :show, - namespace_id: project.namespace.to_param, - project_id: project, - id: issue.iid + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: issue.iid + } expect(session['user_return_to']).to eq("/#{project.namespace.to_param}/#{project.to_param}/issues/#{issue.iid}") end @@ -253,11 +263,13 @@ describe Projects::IssuesController do def move_issue post :move, - format: :json, - namespace_id: project.namespace.to_param, - project_id: project, - id: issue.iid, - move_to_project_id: another_project.id + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: issue.iid, + move_to_project_id: another_project.id + }, + format: :json end end end @@ -265,10 +277,13 @@ describe Projects::IssuesController do describe 'PUT #update' do subject do put :update, - namespace_id: project.namespace, - project_id: project, - id: issue.to_param, - issue: { title: 'New title' }, format: :json + params: { + namespace_id: project.namespace, + project_id: project, + id: issue.to_param, + issue: { title: 'New title' } + }, + format: :json end before do @@ -318,9 +333,11 @@ describe Projects::IssuesController do describe 'GET #realtime_changes' do def go(id:) get :realtime_changes, - namespace_id: project.namespace.to_param, - project_id: project, - id: id + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: id + } end context 'when an issue was edited' do @@ -433,8 +450,10 @@ describe Projects::IssuesController do def get_issues get :index, - namespace_id: project.namespace.to_param, - project_id: project + params: { + namespace_id: project.namespace.to_param, + project_id: project + } end end @@ -502,7 +521,7 @@ describe Projects::IssuesController do format: :json }.merge(additional_params) - put :update, params + put :update, params: params end def go(id:) @@ -635,9 +654,11 @@ describe Projects::IssuesController do def go(id:) get :show, - namespace_id: project.namespace.to_param, - project_id: project, - id: id + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: id + } end it 'avoids (most) N+1s loading labels', :request_store do @@ -658,9 +679,11 @@ describe Projects::IssuesController do def go(id:) get :realtime_changes, - namespace_id: project.namespace.to_param, - project_id: project, - id: id + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: id + } end end @@ -669,9 +692,11 @@ describe Projects::IssuesController do def go(id:) get :edit, - namespace_id: project.namespace.to_param, - project_id: project, - id: id + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: id + } end end @@ -680,10 +705,12 @@ describe Projects::IssuesController do def go(id:) put :update, - namespace_id: project.namespace.to_param, - project_id: project, - id: id, - issue: { title: 'New title' } + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: id, + issue: { title: 'New title' } + } end end end @@ -694,7 +721,7 @@ describe Projects::IssuesController do project = create(:project, :public) project.add_developer(user) - post :create, { + post :create, params: { namespace_id: project.namespace.to_param, project_id: project, issue: { title: 'Title', description: 'Description' }.merge(issue_attrs) @@ -718,7 +745,7 @@ describe Projects::IssuesController do end def post_issue(issue_params, other_params: {}) - post :create, { namespace_id: project.namespace.to_param, project_id: project, issue: issue_params, merge_request_to_resolve_discussions_of: merge_request.iid }.merge(other_params) + post :create, params: { namespace_id: project.namespace.to_param, project_id: project, issue: issue_params, merge_request_to_resolve_discussions_of: merge_request.iid }.merge(other_params) end it 'creates an issue for the project' do @@ -885,7 +912,7 @@ describe Projects::IssuesController do create(:user_agent_detail, subject: issue) project.add_maintainer(admin) sign_in(admin) - post :mark_as_spam, { + post :mark_as_spam, params: { namespace_id: project.namespace, project_id: project, id: issue.iid @@ -906,7 +933,7 @@ describe Projects::IssuesController do end it "rejects a developer to destroy an issue" do - delete :destroy, namespace_id: project.namespace, project_id: project, id: issue.iid + delete :destroy, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } expect(response).to have_gitlab_http_status(404) end end @@ -921,7 +948,7 @@ describe Projects::IssuesController do end it "deletes the issue" do - delete :destroy, namespace_id: project.namespace, project_id: project, id: issue.iid + delete :destroy, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } expect(response).to have_gitlab_http_status(302) expect(controller).to set_flash[:notice].to(/The issue was successfully deleted\./) @@ -930,7 +957,7 @@ describe Projects::IssuesController do it 'delegates the update of the todos count cache to TodoService' do expect_any_instance_of(TodoService).to receive(:destroy_target).with(issue).once - delete :destroy, namespace_id: project.namespace, project_id: project, id: issue.iid + delete :destroy, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } end end end @@ -943,8 +970,12 @@ describe Projects::IssuesController do it "toggles the award emoji" do expect do - post(:toggle_award_emoji, namespace_id: project.namespace, - project_id: project, id: issue.iid, name: "thumbsup") + post(:toggle_award_emoji, params: { + namespace_id: project.namespace, + project_id: project, + id: issue.iid, + name: "thumbsup" + }) end.to change { issue.award_emoji.count }.by(1) expect(response).to have_gitlab_http_status(200) @@ -986,9 +1017,11 @@ describe Projects::IssuesController do end def create_merge_request - post :create_merge_request, namespace_id: project.namespace.to_param, - project_id: project.to_param, - id: issue.to_param, + post :create_merge_request, params: { + namespace_id: project.namespace.to_param, + project_id: project.to_param, + id: issue.to_param + }, format: :json end end @@ -1002,7 +1035,7 @@ describe Projects::IssuesController do end it 'returns discussion json' do - get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion discussion_path individual_note resolvable resolved resolved_at resolved_by resolved_by_push commit_id for_commit project_id]) end @@ -1010,7 +1043,7 @@ describe Projects::IssuesController do it 'renders the author status html if there is a status' do create(:user_status, user: discussion.author) - get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } note_json = json_response.first['notes'].first @@ -1019,14 +1052,14 @@ describe Projects::IssuesController do it 'does not cause an extra query for the status' do control = ActiveRecord::QueryRecorder.new do - get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } end create(:user_status, user: discussion.author) second_discussion = create(:discussion_note_on_issue, noteable: issue, project: issue.project, author: create(:user)) create(:user_status, user: second_discussion.author) - expect { get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid } + expect { get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } } .not_to exceed_query_limit(control) end @@ -1046,26 +1079,26 @@ describe Projects::IssuesController do end it 'filters notes that the user should not see' do - get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } expect(JSON.parse(response.body).count).to eq(1) end it 'does not result in N+1 queries' do # Instantiate the controller variables to ensure QueryRecorder has an accurate base count - get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } RequestStore.clear! control_count = ActiveRecord::QueryRecorder.new do - get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } end.count RequestStore.clear! create_list(:discussion_note_on_issue, 2, :system, noteable: issue, project: issue.project, note: cross_reference) - expect { get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid }.not_to exceed_query_limit(control_count) + expect { get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } }.not_to exceed_query_limit(control_count) end end end diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index fca313dafb1..e1133fdd562 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -96,7 +96,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do project_id: project } - get :index, params.merge(extra_params) + get :index, params: params.merge(extra_params) end end @@ -461,7 +461,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do project_id: project } - get :show, params.merge(extra_params) + get :show, params: params.merge(extra_params) end end @@ -552,9 +552,11 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do end def get_trace - get :trace, namespace_id: project.namespace, - project_id: project, - id: job.id, + get :trace, params: { + namespace_id: project.namespace, + project_id: project, + id: job.id + }, format: :json end end @@ -564,9 +566,11 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do let(:status) { job.detailed_status(double('user')) } before do - get :status, namespace_id: project.namespace, - project_id: project, - id: job.id, + get :status, params: { + namespace_id: project.namespace, + project_id: project, + id: job.id + }, format: :json end @@ -605,9 +609,11 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do end def post_retry - post :retry, namespace_id: project.namespace, - project_id: project, - id: job.id + post :retry, params: { + namespace_id: project.namespace, + project_id: project, + id: job.id + } end end @@ -645,9 +651,11 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do end def post_play - post :play, namespace_id: project.namespace, - project_id: project, - id: job.id + post :play, params: { + namespace_id: project.namespace, + project_id: project, + id: job.id + } end end @@ -714,9 +722,9 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do end def post_cancel(additional_params = {}) - post :cancel, { namespace_id: project.namespace, - project_id: project, - id: job.id }.merge(additional_params) + post :cancel, params: { namespace_id: project.namespace, + project_id: project, + id: job.id }.merge(additional_params) end end @@ -754,9 +762,11 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do end def post_unschedule - post :unschedule, namespace_id: project.namespace, - project_id: project, - id: job.id + post :unschedule, params: { + namespace_id: project.namespace, + project_id: project, + id: job.id + } end end @@ -797,8 +807,10 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do end def post_cancel_all - post :cancel_all, namespace_id: project.namespace, - project_id: project + post :cancel_all, params: { + namespace_id: project.namespace, + project_id: project + } end end @@ -860,17 +872,21 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do end def post_erase - post :erase, namespace_id: project.namespace, - project_id: project, - id: job.id + post :erase, params: { + namespace_id: project.namespace, + project_id: project, + id: job.id + } end end describe 'GET raw' do subject do - post :raw, namespace_id: project.namespace, - project_id: project, - id: job.id + post :raw, params: { + namespace_id: project.namespace, + project_id: project, + id: job.id + } end context "when job has a trace artifact" do @@ -1020,7 +1036,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do project_id: project } - get :terminal, params.merge(extra_params) + get :terminal, params: params.merge(extra_params) end end @@ -1074,7 +1090,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do project_id: project } - get :terminal_websocket_authorize, params.merge(extra_params) + get :terminal_websocket_authorize, params: params.merge(extra_params) end end end diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb index e03d23bcdf6..32897a0f1b4 100644 --- a/spec/controllers/projects/labels_controller_spec.rb +++ b/spec/controllers/projects/labels_controller_spec.rb @@ -67,7 +67,7 @@ describe Projects::LabelsController do end def list_labels - get :index, namespace_id: project.namespace.to_param, project_id: project + get :index, params: { namespace_id: project.namespace.to_param, project_id: project } end end @@ -76,7 +76,7 @@ describe Projects::LabelsController do let(:personal_project) { create(:project, namespace: user.namespace) } it 'creates labels' do - post :generate, namespace_id: personal_project.namespace.to_param, project_id: personal_project + post :generate, params: { namespace_id: personal_project.namespace.to_param, project_id: personal_project } expect(response).to have_gitlab_http_status(302) end @@ -84,7 +84,7 @@ describe Projects::LabelsController do context 'project belonging to a group' do it 'creates labels' do - post :generate, namespace_id: project.namespace.to_param, project_id: project + post :generate, params: { namespace_id: project.namespace.to_param, project_id: project } expect(response).to have_gitlab_http_status(302) end @@ -109,7 +109,7 @@ describe Projects::LabelsController do end def toggle_subscription(label) - post :toggle_subscription, namespace_id: project.namespace.to_param, project_id: project, id: label.to_param + post :toggle_subscription, params: { namespace_id: project.namespace.to_param, project_id: project, id: label.to_param } end end @@ -119,7 +119,7 @@ describe Projects::LabelsController do context 'not group reporters' do it 'denies access' do - post :promote, namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param + post :promote, params: { namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param } expect(response).to have_gitlab_http_status(404) end @@ -131,13 +131,13 @@ describe Projects::LabelsController do end it 'gives access' do - post :promote, namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param + post :promote, params: { namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param } expect(response).to redirect_to(namespace_project_labels_path) end it 'promotes the label' do - post :promote, namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param + post :promote, params: { namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param } expect(Label.where(id: label_1.id)).to be_empty expect(GroupLabel.find_by(title: promoted_label_name)).not_to be_nil @@ -146,7 +146,7 @@ describe Projects::LabelsController do it 'renders label name without parsing it as HTML' do label_1.update!(name: 'CCC<img src=x onerror=alert(document.domain)>') - post :promote, namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param + post :promote, params: { namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param } expect(flash[:notice]).to eq("CCC<img src=x onerror=alert(document.domain)> promoted to <a href=\"#{group_labels_path(project.group)}\"><u>group label</u></a>.") end @@ -159,7 +159,7 @@ describe Projects::LabelsController do end it 'returns to label list' do - post :promote, namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param + post :promote, params: { namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param } expect(response).to redirect_to(namespace_project_labels_path) end end @@ -176,7 +176,7 @@ describe Projects::LabelsController do context 'non-show path' do context 'with exactly matching casing' do it 'does not redirect' do - get :index, namespace_id: project.namespace, project_id: project.to_param + get :index, params: { namespace_id: project.namespace, project_id: project.to_param } expect(response).not_to have_gitlab_http_status(301) end @@ -184,7 +184,7 @@ describe Projects::LabelsController do context 'with different casing' do it 'redirects to the correct casing' do - get :index, namespace_id: project.namespace, project_id: project.to_param.upcase + get :index, params: { namespace_id: project.namespace, project_id: project.to_param.upcase } expect(response).to redirect_to(project_labels_path(project)) expect(controller).not_to set_flash[:notice] @@ -197,7 +197,7 @@ describe Projects::LabelsController do let!(:redirect_route) { project.redirect_routes.create(path: project.full_path + 'old') } it 'redirects to the canonical path' do - get :index, namespace_id: project.namespace, project_id: project.to_param + 'old' + get :index, params: { namespace_id: project.namespace, project_id: project.to_param + 'old' } expect(response).to redirect_to(project_labels_path(project)) expect(controller).to set_flash[:notice].to(project_moved_message(redirect_route, project)) @@ -209,13 +209,13 @@ describe Projects::LabelsController do context 'for a non-GET request' do context 'when requesting the canonical path with different casing' do it 'does not 404' do - post :generate, namespace_id: project.namespace, project_id: project + post :generate, params: { namespace_id: project.namespace, project_id: project } expect(response).not_to have_gitlab_http_status(404) end it 'does not redirect to the correct casing' do - post :generate, namespace_id: project.namespace, project_id: project + post :generate, params: { namespace_id: project.namespace, project_id: project } expect(response).not_to have_gitlab_http_status(301) end @@ -225,7 +225,7 @@ describe Projects::LabelsController do let!(:redirect_route) { project.redirect_routes.create(path: project.full_path + 'old') } it 'returns not found' do - post :generate, namespace_id: project.namespace, project_id: project.to_param + 'old' + post :generate, params: { namespace_id: project.namespace, project_id: project.to_param + 'old' } expect(response).to have_gitlab_http_status(404) end diff --git a/spec/controllers/projects/mattermosts_controller_spec.rb b/spec/controllers/projects/mattermosts_controller_spec.rb index c2a334a849c..6c8c7cd8f2b 100644 --- a/spec/controllers/projects/mattermosts_controller_spec.rb +++ b/spec/controllers/projects/mattermosts_controller_spec.rb @@ -17,8 +17,10 @@ describe Projects::MattermostsController do it 'accepts the request' do get(:new, - namespace_id: project.namespace.to_param, - project_id: project) + params: { + namespace_id: project.namespace.to_param, + project_id: project + }) expect(response).to have_gitlab_http_status(200) end @@ -29,9 +31,11 @@ describe Projects::MattermostsController do subject do post(:create, - namespace_id: project.namespace.to_param, - project_id: project, - mattermost: mattermost_params) + params: { + namespace_id: project.namespace.to_param, + project_id: project, + mattermost: mattermost_params + }) end context 'no request can be made to mattermost' do diff --git a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb index 1e1ea9a7144..039f35875d2 100644 --- a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb @@ -21,9 +21,11 @@ describe Projects::MergeRequests::ConflictsController do .and_raise(Gitlab::Git::Conflict::Parser::UnmergeableFile) get :show, - namespace_id: merge_request_with_conflicts.project.namespace.to_param, - project_id: merge_request_with_conflicts.project, - id: merge_request_with_conflicts.iid, + params: { + namespace_id: merge_request_with_conflicts.project.namespace.to_param, + project_id: merge_request_with_conflicts.project, + id: merge_request_with_conflicts.iid + }, format: 'json' end @@ -39,9 +41,11 @@ describe Projects::MergeRequests::ConflictsController do context 'with valid conflicts' do before do get :show, - namespace_id: merge_request_with_conflicts.project.namespace.to_param, - project_id: merge_request_with_conflicts.project, - id: merge_request_with_conflicts.iid, + params: { + namespace_id: merge_request_with_conflicts.project.namespace.to_param, + project_id: merge_request_with_conflicts.project, + id: merge_request_with_conflicts.iid + }, format: 'json' end @@ -99,11 +103,13 @@ describe Projects::MergeRequests::ConflictsController do describe 'GET conflict_for_path' do def conflict_for_path(path) get :conflict_for_path, - namespace_id: merge_request_with_conflicts.project.namespace.to_param, - project_id: merge_request_with_conflicts.project, - id: merge_request_with_conflicts.iid, - old_path: path, - new_path: path, + params: { + namespace_id: merge_request_with_conflicts.project.namespace.to_param, + project_id: merge_request_with_conflicts.project, + id: merge_request_with_conflicts.iid, + old_path: path, + new_path: path + }, format: 'json' end @@ -160,12 +166,14 @@ describe Projects::MergeRequests::ConflictsController do def resolve_conflicts(files) post :resolve_conflicts, - namespace_id: merge_request_with_conflicts.project.namespace.to_param, - project_id: merge_request_with_conflicts.project, - id: merge_request_with_conflicts.iid, - format: 'json', - files: files, - commit_message: 'Commit message' + params: { + namespace_id: merge_request_with_conflicts.project.namespace.to_param, + project_id: merge_request_with_conflicts.project, + id: merge_request_with_conflicts.iid, + files: files, + commit_message: 'Commit message' + }, + format: 'json' end context 'with valid params' do diff --git a/spec/controllers/projects/merge_requests/creations_controller_spec.rb b/spec/controllers/projects/merge_requests/creations_controller_spec.rb index f8c37c0a676..ac93393ac3a 100644 --- a/spec/controllers/projects/merge_requests/creations_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/creations_controller_spec.rb @@ -24,7 +24,7 @@ describe Projects::MergeRequests::CreationsController do describe 'GET new' do context 'merge request that removes a submodule' do it 'renders new merge request widget template' do - get :new, get_diff_params + get :new, params: get_diff_params expect(response).to be_success end @@ -52,7 +52,7 @@ describe Projects::MergeRequests::CreationsController do end it 'limits total commits' do - get :new, large_diff_params + get :new, params: large_diff_params expect(response).to be_success @@ -66,7 +66,7 @@ describe Projects::MergeRequests::CreationsController do end it 'shows total commits' do - get :new, large_diff_params + get :new, params: large_diff_params expect(response).to be_success @@ -85,7 +85,7 @@ describe Projects::MergeRequests::CreationsController do it 'does not assign diffs var' do allow_any_instance_of(MergeRequest).to receive(:can_be_created).and_return(false) - get :diffs, get_diff_params.merge(format: 'json') + get :diffs, params: get_diff_params.merge(format: 'json') expect(response).to be_success expect(assigns[:diffs]).to be_nil @@ -101,7 +101,7 @@ describe Projects::MergeRequests::CreationsController do end it 'renders JSON including serialized pipelines' do - get :pipelines, get_diff_params.merge(format: 'json') + get :pipelines, params: get_diff_params.merge(format: 'json') expect(response).to be_ok expect(json_response).to have_key 'pipelines' @@ -117,7 +117,7 @@ describe Projects::MergeRequests::CreationsController do format: 'json' } - get :diff_for_path, params.merge(extra_params) + get :diff_for_path, params: params.merge(extra_params) end let(:existing_path) { 'files/ruby/feature.rb' } @@ -184,10 +184,12 @@ describe Projects::MergeRequests::CreationsController do expect(Ability).to receive(:allowed?).with(user, :read_project, project) { true } get :branch_to, - namespace_id: fork_project.namespace, - project_id: fork_project, - target_project_id: project.id, - ref: 'master' + params: { + namespace_id: fork_project.namespace, + project_id: fork_project, + target_project_id: project.id, + ref: 'master' + } expect(assigns(:commit)).not_to be_nil expect(response).to have_gitlab_http_status(200) @@ -197,10 +199,12 @@ describe Projects::MergeRequests::CreationsController do expect(Ability).to receive(:allowed?).with(user, :read_project, project) { false } get :branch_to, - namespace_id: fork_project.namespace, - project_id: fork_project, - target_project_id: project.id, - ref: 'master' + params: { + namespace_id: fork_project.namespace, + project_id: fork_project, + target_project_id: project.id, + ref: 'master' + } expect(assigns(:commit)).to be_nil expect(response).to have_gitlab_http_status(200) diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb index 8fc5d302af6..a6017d8e5e6 100644 --- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb @@ -20,7 +20,7 @@ describe Projects::MergeRequests::DiffsController do format: 'json' } - get :show, params.merge(extra_params) + get :show, params: params.merge(extra_params) end context 'with default params' do @@ -89,7 +89,7 @@ describe Projects::MergeRequests::DiffsController do format: 'json' } - get :diff_for_path, params.merge(extra_params) + get :diff_for_path, params: params.merge(extra_params) end let(:existing_path) { 'files/ruby/popen.rb' } diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index e837c99d19c..962dfb91c9f 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -19,9 +19,11 @@ describe Projects::MergeRequestsController do describe 'GET commit_change_content' do it 'renders commit_change_content template' do get :commit_change_content, - namespace_id: project.namespace.to_param, - project_id: project, - id: merge_request.iid, + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: merge_request.iid + }, format: 'html' expect(response).to render_template('_commit_change_content') @@ -31,9 +33,11 @@ describe Projects::MergeRequestsController do shared_examples "loads labels" do |action| it "loads labels into the @labels variable" do get action, - namespace_id: project.namespace.to_param, - project_id: project, - id: merge_request.iid, + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: merge_request.iid + }, format: 'html' expect(assigns(:labels)).not_to be_nil end @@ -47,7 +51,7 @@ describe Projects::MergeRequestsController do id: merge_request.iid } - get :show, params.merge(extra_params) + get :show, params: params.merge(extra_params) end it_behaves_like "loads labels", :show @@ -153,9 +157,12 @@ describe Projects::MergeRequestsController do def get_merge_requests(page = nil) get :index, - namespace_id: project.namespace.to_param, - project_id: project, - state: 'opened', page: page.to_param + params: { + namespace_id: project.namespace.to_param, + project_id: project, + state: 'opened', + page: page.to_param + } end it_behaves_like "issuables list meta-data", :merge_request @@ -182,11 +189,13 @@ describe Projects::MergeRequestsController do it 'does not redirect to external sites when provided a host field' do external_host = "www.example.com" get :index, - namespace_id: project.namespace.to_param, - project_id: project, - state: 'opened', - page: (last_page + 1).to_param, - host: external_host + params: { + namespace_id: project.namespace.to_param, + project_id: project, + state: 'opened', + page: (last_page + 1).to_param, + host: external_host + } expect(response).to redirect_to(namespace_project_merge_requests_path(page: last_page, state: controller.params[:state], scope: controller.params[:scope])) end @@ -227,7 +236,7 @@ describe Projects::MergeRequestsController do merge_request: mr_params }.merge(additional_params) - put :update, params + put :update, params: params end context 'changing the assignee' do @@ -324,7 +333,7 @@ describe Projects::MergeRequestsController do before do project.add_reporter(user) - xhr :post, :merge, base_params + xhr :post, :merge, params: base_params end it 'returns 404' do @@ -336,7 +345,7 @@ describe Projects::MergeRequestsController do before do merge_request.update(title: "WIP: #{merge_request.title}") - post :merge, base_params + post :merge, params: base_params end it 'returns :failed' do @@ -346,7 +355,7 @@ describe Projects::MergeRequestsController do context 'when the sha parameter does not match the source SHA' do before do - post :merge, base_params.merge(sha: 'foo') + post :merge, params: base_params.merge(sha: 'foo') end it 'returns :sha_mismatch' do @@ -396,7 +405,7 @@ describe Projects::MergeRequestsController do end def merge_when_pipeline_succeeds - post :merge, base_params.merge(sha: merge_request.diff_head_sha, merge_when_pipeline_succeeds: '1') + post :merge, params: base_params.merge(sha: merge_request.diff_head_sha, merge_when_pipeline_succeeds: '1') end it 'returns :merge_when_pipeline_succeeds' do @@ -513,7 +522,7 @@ describe Projects::MergeRequestsController do let(:user) { create(:user) } it "denies access to users unless they're admin or project owner" do - delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid + delete :destroy, params: { namespace_id: project.namespace, project_id: project, id: merge_request.iid } expect(response).to have_gitlab_http_status(404) end @@ -528,7 +537,7 @@ describe Projects::MergeRequestsController do end it "deletes the merge request" do - delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid + delete :destroy, params: { namespace_id: project.namespace, project_id: project, id: merge_request.iid } expect(response).to have_gitlab_http_status(302) expect(controller).to set_flash[:notice].to(/The merge request was successfully deleted\./) @@ -537,7 +546,7 @@ describe Projects::MergeRequestsController do it 'delegates the update of the todos count cache to TodoService' do expect_any_instance_of(TodoService).to receive(:destroy_target).with(merge_request).once - delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid + delete :destroy, params: { namespace_id: project.namespace, project_id: project, id: merge_request.iid } end end end @@ -545,9 +554,11 @@ describe Projects::MergeRequestsController do describe 'GET commits' do def go(format: 'html') get :commits, - namespace_id: project.namespace.to_param, - project_id: project, - id: merge_request.iid, + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: merge_request.iid + }, format: format end @@ -566,9 +577,11 @@ describe Projects::MergeRequestsController do sha: merge_request.diff_head_sha) get :pipelines, - namespace_id: project.namespace.to_param, - project_id: project, - id: merge_request.iid, + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: merge_request.iid + }, format: :json end @@ -582,9 +595,11 @@ describe Projects::MergeRequestsController do describe 'GET test_reports' do subject do get :test_reports, - namespace_id: project.namespace.to_param, - project_id: project, - id: merge_request.iid, + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: merge_request.iid + }, format: :json end @@ -667,10 +682,12 @@ describe Projects::MergeRequestsController do merge_request.save xhr :post, :remove_wip, - namespace_id: merge_request.project.namespace.to_param, - project_id: merge_request.project, - id: merge_request.iid, - format: :json + format: :json, + params: { + namespace_id: merge_request.project.namespace.to_param, + project_id: merge_request.project, + id: merge_request.iid + } end it 'removes the wip status' do @@ -685,10 +702,12 @@ describe Projects::MergeRequestsController do describe 'POST cancel_merge_when_pipeline_succeeds' do subject do xhr :post, :cancel_merge_when_pipeline_succeeds, - namespace_id: merge_request.project.namespace.to_param, - project_id: merge_request.project, - id: merge_request.iid, - format: :json + format: :json, + params: { + namespace_id: merge_request.project.namespace.to_param, + project_id: merge_request.project, + id: merge_request.iid + } end it 'calls MergeRequests::MergeWhenPipelineSucceedsService' do @@ -723,9 +742,11 @@ describe Projects::MergeRequestsController do target_branch: 'master') post :assign_related_issues, - namespace_id: project.namespace.to_param, - project_id: project, - id: merge_request.iid + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: merge_request.iid + } end it 'shows a flash message on success' do @@ -824,7 +845,7 @@ describe Projects::MergeRequestsController do format: 'json' } - get :ci_environments_status, params.merge(extra_params) + get :ci_environments_status, params: params.merge(extra_params) end end end @@ -865,9 +886,11 @@ describe Projects::MergeRequestsController do end def get_pipeline_status - get :pipeline_status, namespace_id: project.namespace, - project_id: project, - id: merge_request.iid, + get :pipeline_status, params: { + namespace_id: project.namespace, + project_id: project, + id: merge_request.iid + }, format: :json end end @@ -876,7 +899,7 @@ describe Projects::MergeRequestsController do let(:viewer) { user } def post_rebase - post :rebase, namespace_id: project.namespace, project_id: project, id: merge_request + post :rebase, params: { namespace_id: project.namespace, project_id: project, id: merge_request } end def expect_rebase_worker_for(user) @@ -934,13 +957,13 @@ describe Projects::MergeRequestsController do describe 'GET edit' do it 'responds successfully' do - get :edit, namespace_id: project.namespace, project_id: project, id: merge_request + get :edit, params: { namespace_id: project.namespace, project_id: project, id: merge_request } expect(response).to have_gitlab_http_status(:success) end it 'assigns the noteable to make sure autocompletes work' do - get :edit, namespace_id: project.namespace, project_id: project, id: merge_request + get :edit, params: { namespace_id: project.namespace, project_id: project, id: merge_request } expect(assigns(:noteable)).not_to be_nil end diff --git a/spec/controllers/projects/milestones_controller_spec.rb b/spec/controllers/projects/milestones_controller_spec.rb index 658aa2a6738..5892024e756 100644 --- a/spec/controllers/projects/milestones_controller_spec.rb +++ b/spec/controllers/projects/milestones_controller_spec.rb @@ -22,7 +22,7 @@ describe Projects::MilestonesController do def view_milestone(options = {}) params = { namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid } - get :show, params.merge(options) + get :show, params: params.merge(options) end it 'shows milestone page' do @@ -43,9 +43,11 @@ describe Projects::MilestonesController do describe "#index" do context "as html" do def render_index(project:, page:) - get :index, namespace_id: project.namespace.id, - project_id: project.id, - page: page + get :index, params: { + namespace_id: project.namespace.id, + project_id: project.id, + page: page + } end it "queries only projects milestones" do @@ -90,7 +92,7 @@ describe Projects::MilestonesController do context 'with a single group ancestor' do before do project.update(namespace: group) - get :index, namespace_id: project.namespace.id, project_id: project.id, format: :json + get :index, params: { namespace_id: project.namespace.id, project_id: project.id }, format: :json end it "queries projects milestones and groups milestones" do @@ -107,7 +109,7 @@ describe Projects::MilestonesController do before do project.update(namespace: subgroup) - get :index, namespace_id: project.namespace.id, project_id: project.id, format: :json + get :index, params: { namespace_id: project.namespace.id, project_id: project.id }, format: :json end it "queries projects milestones and all ancestors milestones" do @@ -124,7 +126,7 @@ describe Projects::MilestonesController do it "removes milestone" do expect(issue.milestone_id).to eq(milestone.id) - delete :destroy, namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid, format: :js + delete :destroy, params: { namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid }, format: :js expect(response).to be_success expect(Event.recent.first.action).to eq(Event::DESTROYED) @@ -155,7 +157,7 @@ describe Projects::MilestonesController do end it 'renders 404' do - post :promote, namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid + post :promote, params: { namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid } expect(response).to have_gitlab_http_status(404) end @@ -167,7 +169,7 @@ describe Projects::MilestonesController do end it 'shows group milestone' do - post :promote, namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid + post :promote, params: { namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid } expect(flash[:notice]).to eq("#{milestone.title} promoted to <a href=\"#{group_milestone_path(project.group, milestone.iid)}\"><u>group milestone</u></a>.") expect(response).to redirect_to(project_milestones_path(project)) @@ -176,7 +178,7 @@ describe Projects::MilestonesController do it 'renders milestone name without parsing it as HTML' do milestone.update!(name: 'CCC<img src=x onerror=alert(document.domain)>') - post :promote, namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid + post :promote, params: { namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid } expect(flash[:notice]).to eq("CCC promoted to <a href=\"#{group_milestone_path(project.group, milestone.iid)}\"><u>group milestone</u></a>.") end @@ -190,7 +192,7 @@ describe Projects::MilestonesController do it 'renders 404' do project.update(namespace: user.namespace) - post :promote, namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid + post :promote, params: { namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid } expect(response).to have_gitlab_http_status(404) end diff --git a/spec/controllers/projects/mirrors_controller_spec.rb b/spec/controllers/projects/mirrors_controller_spec.rb index 976f480930c..86a12a5e903 100644 --- a/spec/controllers/projects/mirrors_controller_spec.rb +++ b/spec/controllers/projects/mirrors_controller_spec.rb @@ -147,7 +147,7 @@ describe Projects::MirrorsController do end def do_get(project, url = 'ssh://example.com') - get :ssh_host_keys, namespace_id: project.namespace, project_id: project, ssh_url: url + get :ssh_host_keys, params: { namespace_id: project.namespace, project_id: project, ssh_url: url } end end @@ -155,6 +155,6 @@ describe Projects::MirrorsController do attrs = extra_attrs.merge(namespace_id: project.namespace.to_param, project_id: project.to_param) attrs[:project] = options - put :update, attrs + put :update, params: attrs end end diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 9a5df2aded7..81892575889 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -44,7 +44,7 @@ describe Projects::NotesController do .with(anything, anything, hash_including(last_fetched_at: last_fetched_at)) .and_call_original - get :index, request_params + get :index, params: request_params end context 'when user notes_filter is present' do @@ -55,7 +55,7 @@ describe Projects::NotesController do it 'filters system notes by comments' do user.set_notes_filter(UserPreference::NOTES_FILTERS[:only_comments], issue) - get :index, request_params + get :index, params: request_params expect(notes_json.count).to eq(1) expect(notes_json.first[:id].to_i).to eq(comment.id) @@ -64,7 +64,7 @@ describe Projects::NotesController do it 'returns all notes' do user.set_notes_filter(UserPreference::NOTES_FILTERS[:all_notes], issue) - get :index, request_params + get :index, params: request_params expect(notes_json.map { |note| note[:id].to_i }).to contain_exactly(comment.id, system_note.id) end @@ -74,7 +74,7 @@ describe Projects::NotesController do expect(ResourceEvents::MergeIntoNotesService).not_to receive(:new) - get :index, request_params + get :index, params: request_params end end @@ -85,7 +85,7 @@ describe Projects::NotesController do let(:params) { request_params.merge(target_type: 'merge_request', target_id: note.noteable_id, html: true) } it 'responds with the expected attributes' do - get :index, params + get :index, params: params expect(note_json[:id]).to eq(note.id) expect(note_json[:discussion_html]).not_to be_nil @@ -101,7 +101,7 @@ describe Projects::NotesController do let(:params) { request_params.merge(target_type: 'merge_request', target_id: note.noteable_id, html: true) } it 'responds with the expected attributes' do - get :index, params + get :index, params: params expect(note_json[:id]).to eq(note.id) expect(note_json[:discussion_html]).not_to be_nil @@ -120,7 +120,7 @@ describe Projects::NotesController do let(:params) { request_params.merge(target_type: 'merge_request', target_id: merge_request.id, html: true) } it 'responds with the expected attributes' do - get :index, params + get :index, params: params expect(note_json[:id]).to eq(note.id) expect(note_json[:discussion_html]).not_to be_nil @@ -133,7 +133,7 @@ describe Projects::NotesController do let(:params) { request_params.merge(target_type: 'commit', target_id: note.commit_id, html: true) } it 'responds with the expected attributes' do - get :index, params + get :index, params: params expect(note_json[:id]).to eq(note.id) expect(note_json[:discussion_html]).to be_nil @@ -148,7 +148,7 @@ describe Projects::NotesController do end it 'renders 404' do - get :index, params + get :index, params: params expect(response).to have_gitlab_http_status(404) end @@ -162,7 +162,7 @@ describe Projects::NotesController do let(:params) { request_params.merge(target_type: 'merge_request', target_id: note.noteable_id, html: true) } it 'responds with the expected attributes' do - get :index, params + get :index, params: params expect(note_json[:id]).to eq(note.id) expect(note_json[:html]).not_to be_nil @@ -182,7 +182,7 @@ describe Projects::NotesController do end it 'filters notes that the user should not see' do - get :index, request_params + get :index, params: request_params expect(parsed_response[:notes].count).to eq(1) expect(note_json[:id]).to eq(note.id.to_s) @@ -190,19 +190,19 @@ describe Projects::NotesController do it 'does not result in N+1 queries' do # Instantiate the controller variables to ensure QueryRecorder has an accurate base count - get :index, request_params + get :index, params: request_params RequestStore.clear! control_count = ActiveRecord::QueryRecorder.new do - get :index, request_params + get :index, params: request_params end.count RequestStore.clear! create_list(:discussion_note_on_issue, 2, :system, noteable: issue, project: issue.project, note: cross_reference) - expect { get :index, request_params }.not_to exceed_query_limit(control_count) + expect { get :index, params: request_params }.not_to exceed_query_limit(control_count) end end end @@ -227,19 +227,19 @@ describe Projects::NotesController do end it "returns status 302 for html" do - post :create, request_params + post :create, params: request_params expect(response).to have_gitlab_http_status(302) end it "returns status 200 for json" do - post :create, request_params.merge(format: :json) + post :create, params: request_params.merge(format: :json) expect(response).to have_gitlab_http_status(200) end it 'returns discussion JSON when the return_discussion param is set' do - post :create, request_params.merge(format: :json, return_discussion: 'true') + post :create, params: request_params.merge(format: :json, return_discussion: 'true') expect(response).to have_gitlab_http_status(200) expect(json_response).to have_key 'discussion' @@ -260,7 +260,7 @@ describe Projects::NotesController do end it "returns status 302 for html" do - post :create, request_params + post :create, params: request_params expect(response).to have_gitlab_http_status(302) end @@ -282,7 +282,7 @@ describe Projects::NotesController do end def post_create(extra_params = {}) - post :create, { + post :create, params: { note: { note: 'some other note', noteable_id: merge_request.id }, namespace_id: project.namespace, project_id: project, @@ -342,7 +342,7 @@ describe Projects::NotesController do namespace_id: project.namespace } - expect { post :create, request_params }.to change { issue.notes.count }.by(1) + expect { post :create, params: request_params }.to change { issue.notes.count }.by(1) .and change { locked_issue.notes.count }.by(0) expect(response).to have_gitlab_http_status(302) end @@ -357,7 +357,7 @@ describe Projects::NotesController do context 'when a noteable is not found' do it 'returns 404 status' do request_params[:target_id] = 9999 - post :create, request_params.merge(format: :json) + post :create, params: request_params.merge(format: :json) expect(response).to have_gitlab_http_status(404) end @@ -365,19 +365,19 @@ describe Projects::NotesController do context 'when a user is a team member' do it 'returns 302 status for html' do - post :create, request_params + post :create, params: request_params expect(response).to have_gitlab_http_status(302) end it 'returns 200 status for json' do - post :create, request_params.merge(format: :json) + post :create, params: request_params.merge(format: :json) expect(response).to have_gitlab_http_status(200) end it 'creates a new note' do - expect { post :create, request_params }.to change { Note.count }.by(1) + expect { post :create, params: request_params }.to change { Note.count }.by(1) end end @@ -387,13 +387,13 @@ describe Projects::NotesController do end it 'returns 404 status' do - post :create, request_params + post :create, params: request_params expect(response).to have_gitlab_http_status(404) end it 'does not create a new note' do - expect { post :create, request_params }.not_to change { Note.count } + expect { post :create, params: request_params }.not_to change { Note.count } end end end @@ -419,7 +419,7 @@ describe Projects::NotesController do end it "updates the note" do - expect { put :update, request_params }.to change { note.reload.note } + expect { put :update, params: request_params }.to change { note.reload.note } end end context "doesnt update the note" do @@ -441,7 +441,7 @@ describe Projects::NotesController do note: "New comment" } } - expect { put :update, request_params }.not_to change { note.reload.note } + expect { put :update, params: request_params }.not_to change { note.reload.note } expect(response).to have_gitlab_http_status(404) end end @@ -464,13 +464,13 @@ describe Projects::NotesController do end it "returns status 200 for html" do - delete :destroy, request_params + delete :destroy, params: request_params expect(response).to have_gitlab_http_status(200) end it "deletes the note" do - expect { delete :destroy, request_params }.to change { Note.count }.from(1).to(0) + expect { delete :destroy, params: request_params }.to change { Note.count }.from(1).to(0) end end @@ -481,7 +481,7 @@ describe Projects::NotesController do end it "returns status 404" do - delete :destroy, request_params + delete :destroy, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -496,17 +496,17 @@ describe Projects::NotesController do it "toggles the award emoji" do expect do - post(:toggle_award_emoji, request_params.merge(name: "thumbsup")) + post(:toggle_award_emoji, params: request_params.merge(name: "thumbsup")) end.to change { note.award_emoji.count }.by(1) expect(response).to have_gitlab_http_status(200) end it "removes the already awarded emoji" do - post(:toggle_award_emoji, request_params.merge(name: "thumbsup")) + post(:toggle_award_emoji, params: request_params.merge(name: "thumbsup")) expect do - post(:toggle_award_emoji, request_params.merge(name: "thumbsup")) + post(:toggle_award_emoji, params: request_params.merge(name: "thumbsup")) end.to change { AwardEmoji.count }.by(-1) expect(response).to have_gitlab_http_status(200) @@ -525,7 +525,7 @@ describe Projects::NotesController do context "when the user is not authorized to resolve the note" do it "returns status 404" do - post :resolve, request_params + post :resolve, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -542,7 +542,7 @@ describe Projects::NotesController do end it "returns status 404" do - post :resolve, request_params + post :resolve, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -550,7 +550,7 @@ describe Projects::NotesController do context "when the note is resolvable" do it "resolves the note" do - post :resolve, request_params + post :resolve, params: request_params expect(note.reload.resolved?).to be true expect(note.reload.resolved_by).to eq(user) @@ -559,17 +559,17 @@ describe Projects::NotesController do it "sends notifications if all discussions are resolved" do expect_any_instance_of(MergeRequests::ResolvedDiscussionNotificationService).to receive(:execute).with(merge_request) - post :resolve, request_params + post :resolve, params: request_params end it "returns the name of the resolving user" do - post :resolve, request_params.merge(html: true) + post :resolve, params: request_params.merge(html: true) expect(JSON.parse(response.body)["resolved_by"]).to eq(user.name) end it "returns status 200" do - post :resolve, request_params + post :resolve, params: request_params expect(response).to have_gitlab_http_status(200) end @@ -586,7 +586,7 @@ describe Projects::NotesController do context "when the user is not authorized to resolve the note" do it "returns status 404" do - delete :unresolve, request_params + delete :unresolve, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -603,7 +603,7 @@ describe Projects::NotesController do end it "returns status 404" do - delete :unresolve, request_params + delete :unresolve, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -611,13 +611,13 @@ describe Projects::NotesController do context "when the note is resolvable" do it "unresolves the note" do - delete :unresolve, request_params + delete :unresolve, params: request_params expect(note.reload.resolved?).to be false end it "returns status 200" do - delete :unresolve, request_params + delete :unresolve, params: request_params expect(response).to have_gitlab_http_status(200) end diff --git a/spec/controllers/projects/pages_controller_spec.rb b/spec/controllers/projects/pages_controller_spec.rb index 927b6e0c473..382c1b5d124 100644 --- a/spec/controllers/projects/pages_controller_spec.rb +++ b/spec/controllers/projects/pages_controller_spec.rb @@ -19,7 +19,7 @@ describe Projects::PagesController do describe 'GET show' do it 'returns 200 status' do - get :show, request_params + get :show, params: request_params expect(response).to have_gitlab_http_status(200) end @@ -29,7 +29,7 @@ describe Projects::PagesController do let(:project) { create(:project, namespace: group) } it 'returns a 404 status code' do - get :show, request_params + get :show, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -38,7 +38,7 @@ describe Projects::PagesController do describe 'DELETE destroy' do it 'returns 302 status' do - delete :destroy, request_params + delete :destroy, params: request_params expect(response).to have_gitlab_http_status(302) end @@ -51,7 +51,7 @@ describe Projects::PagesController do describe 'GET show' do it 'returns 404 status' do - get :show, request_params + get :show, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -59,7 +59,7 @@ describe Projects::PagesController do describe 'DELETE destroy' do it 'returns 404 status' do - delete :destroy, request_params + delete :destroy, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -82,13 +82,13 @@ describe Projects::PagesController do end it 'returns 302 status' do - patch :update, request_params + patch :update, params: request_params expect(response).to have_gitlab_http_status(:found) end it 'redirects back to the pages settings' do - patch :update, request_params + patch :update, params: request_params expect(response).to redirect_to(project_pages_path(project)) end @@ -99,7 +99,7 @@ describe Projects::PagesController do .with(project, user, ActionController::Parameters.new(request_params[:project]).permit!) .and_return(update_service) - patch :update, request_params + patch :update, params: request_params end end end diff --git a/spec/controllers/projects/pages_domains_controller_spec.rb b/spec/controllers/projects/pages_domains_controller_spec.rb index b9cf3e9b091..8b7f7587701 100644 --- a/spec/controllers/projects/pages_domains_controller_spec.rb +++ b/spec/controllers/projects/pages_domains_controller_spec.rb @@ -24,7 +24,7 @@ describe Projects::PagesDomainsController do describe 'GET show' do it "displays the 'show' page" do - get(:show, request_params.merge(id: pages_domain.domain)) + get(:show, params: request_params.merge(id: pages_domain.domain)) expect(response).to have_gitlab_http_status(200) expect(response).to render_template('show') @@ -33,7 +33,7 @@ describe Projects::PagesDomainsController do describe 'GET new' do it "displays the 'new' page" do - get(:new, request_params) + get(:new, params: request_params) expect(response).to have_gitlab_http_status(200) expect(response).to render_template('new') @@ -43,7 +43,7 @@ describe Projects::PagesDomainsController do describe 'POST create' do it "creates a new pages domain" do expect do - post(:create, request_params.merge(pages_domain: pages_domain_params)) + post(:create, params: request_params.merge(pages_domain: pages_domain_params)) end.to change { PagesDomain.count }.by(1) created_domain = PagesDomain.reorder(:id).last @@ -55,7 +55,7 @@ describe Projects::PagesDomainsController do describe 'GET edit' do it "displays the 'edit' page" do - get(:edit, request_params.merge(id: pages_domain.domain)) + get(:edit, params: request_params.merge(id: pages_domain.domain)) expect(response).to have_gitlab_http_status(200) expect(response).to render_template('edit') @@ -81,11 +81,11 @@ describe Projects::PagesDomainsController do .with(ActionController::Parameters.new(pages_domain_params).permit!) .and_return(true) - patch(:update, params) + patch(:update, params: params) end it 'redirects to the project page' do - patch(:update, params) + patch(:update, params: params) expect(flash[:notice]).to eq 'Domain was updated' expect(response).to redirect_to(project_pages_path(project)) @@ -95,7 +95,7 @@ describe Projects::PagesDomainsController do it 'renders the edit action' do allow(pages_domain).to receive(:update).and_return(false) - patch(:update, params) + patch(:update, params: params) expect(response).to render_template('edit') end @@ -108,7 +108,7 @@ describe Projects::PagesDomainsController do .with(hash_not_including(:domain)) .and_return(true) - patch(:update, params.deep_merge(pages_domain: { domain: 'abc' })) + patch(:update, params: params.deep_merge(pages_domain: { domain: 'abc' })) end end end @@ -127,7 +127,7 @@ describe Projects::PagesDomainsController do it 'handles verification success' do expect(stub_service).to receive(:execute).and_return(status: :success) - post :verify, params + post :verify, params: params expect(response).to redirect_to project_pages_domain_path(project, pages_domain) expect(flash[:notice]).to eq('Successfully verified domain ownership') @@ -136,14 +136,14 @@ describe Projects::PagesDomainsController do it 'handles verification failure' do expect(stub_service).to receive(:execute).and_return(status: :failed) - post :verify, params + post :verify, params: params expect(response).to redirect_to project_pages_domain_path(project, pages_domain) expect(flash[:alert]).to eq('Failed to verify domain ownership') end it 'returns a 404 response for an unknown domain' do - post :verify, request_params.merge(id: 'unknown-domain') + post :verify, params: request_params.merge(id: 'unknown-domain') expect(response).to have_gitlab_http_status(404) end @@ -152,7 +152,7 @@ describe Projects::PagesDomainsController do describe 'DELETE destroy' do it "deletes the pages domain" do expect do - delete(:destroy, request_params.merge(id: pages_domain.domain)) + delete(:destroy, params: request_params.merge(id: pages_domain.domain)) end.to change { PagesDomain.count }.by(-1) expect(response).to redirect_to(project_pages_path(project)) @@ -166,7 +166,7 @@ describe Projects::PagesDomainsController do describe 'GET show' do it 'returns 404 status' do - get(:show, request_params.merge(id: pages_domain.domain)) + get(:show, params: request_params.merge(id: pages_domain.domain)) expect(response).to have_gitlab_http_status(404) end @@ -174,7 +174,7 @@ describe Projects::PagesDomainsController do describe 'GET new' do it 'returns 404 status' do - get :new, request_params + get :new, params: request_params expect(response).to have_gitlab_http_status(404) end @@ -182,7 +182,7 @@ describe Projects::PagesDomainsController do describe 'POST create' do it "returns 404 status" do - post(:create, request_params.merge(pages_domain: pages_domain_params)) + post(:create, params: request_params.merge(pages_domain: pages_domain_params)) expect(response).to have_gitlab_http_status(404) end @@ -190,7 +190,7 @@ describe Projects::PagesDomainsController do describe 'DELETE destroy' do it "deletes the pages domain" do - delete(:destroy, request_params.merge(id: pages_domain.domain)) + delete(:destroy, params: request_params.merge(id: pages_domain.domain)) expect(response).to have_gitlab_http_status(404) end diff --git a/spec/controllers/projects/pipeline_schedules_controller_spec.rb b/spec/controllers/projects/pipeline_schedules_controller_spec.rb index 08e2c957d69..80506249ea9 100644 --- a/spec/controllers/projects/pipeline_schedules_controller_spec.rb +++ b/spec/controllers/projects/pipeline_schedules_controller_spec.rb @@ -44,7 +44,7 @@ describe Projects::PipelineSchedulesController do end def visit_pipelines_schedules - get :index, namespace_id: project.namespace.to_param, project_id: project, scope: scope + get :index, params: { namespace_id: project.namespace.to_param, project_id: project, scope: scope } end end @@ -57,7 +57,7 @@ describe Projects::PipelineSchedulesController do end it 'initializes a pipeline schedule model' do - get :new, namespace_id: project.namespace.to_param, project_id: project + get :new, params: { namespace_id: project.namespace.to_param, project_id: project } expect(response).to have_gitlab_http_status(:ok) expect(assigns(:schedule)).to be_a_new(Ci::PipelineSchedule) @@ -131,7 +131,7 @@ describe Projects::PipelineSchedulesController do end def go - post :create, namespace_id: project.namespace.to_param, project_id: project, schedule: schedule + post :create, params: { namespace_id: project.namespace.to_param, project_id: project, schedule: schedule } end end @@ -328,7 +328,7 @@ describe Projects::PipelineSchedulesController do end it 'loads the pipeline schedule' do - get :edit, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id + get :edit, params: { namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id } expect(response).to have_gitlab_http_status(:ok) expect(assigns(:schedule)).to eq(pipeline_schedule) @@ -348,7 +348,7 @@ describe Projects::PipelineSchedulesController do end def go - get :edit, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id + get :edit, params: { namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id } end end @@ -366,7 +366,7 @@ describe Projects::PipelineSchedulesController do end def go - post :take_ownership, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id + post :take_ownership, params: { namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id } end end @@ -388,7 +388,7 @@ describe Projects::PipelineSchedulesController do it 'does not allow pipeline to be executed' do expect(RunPipelineScheduleWorker).not_to receive(:perform_async) - post :play, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id + post :play, params: { namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id } expect(response).to have_gitlab_http_status(404) end @@ -398,7 +398,7 @@ describe Projects::PipelineSchedulesController do it 'executes a new pipeline' do expect(RunPipelineScheduleWorker).to receive(:perform_async).with(pipeline_schedule.id, user.id).and_return('job-123') - post :play, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id + post :play, params: { namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id } expect(flash[:notice]).to start_with 'Successfully scheduled a pipeline to run' expect(response).to have_gitlab_http_status(302) @@ -406,7 +406,7 @@ describe Projects::PipelineSchedulesController do it 'prevents users from scheduling the same pipeline repeatedly' do 2.times do - post :play, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id + post :play, params: { namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id } end expect(flash.to_a.size).to eq(2) @@ -422,7 +422,7 @@ describe Projects::PipelineSchedulesController do expect(RunPipelineScheduleWorker).not_to receive(:perform_async) - post :play, namespace_id: project.namespace.to_param, project_id: project, id: protected_schedule.id + post :play, params: { namespace_id: project.namespace.to_param, project_id: project, id: protected_schedule.id } expect(response).to have_gitlab_http_status(404) end @@ -437,7 +437,7 @@ describe Projects::PipelineSchedulesController do project.add_developer(user) sign_in(user) - delete :destroy, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id + delete :destroy, params: { namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id } end it 'does not delete the pipeline schedule' do @@ -453,7 +453,7 @@ describe Projects::PipelineSchedulesController do it 'destroys the pipeline schedule' do expect do - delete :destroy, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id + delete :destroy, params: { namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id } end.to change { project.pipeline_schedules.count }.by(-1) expect(response).to have_gitlab_http_status(302) diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index 5c7415a318d..0bb3ef76a3b 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -119,8 +119,10 @@ describe Projects::PipelinesController do end def get_pipelines_index_json - get :index, namespace_id: project.namespace, - project_id: project, + get :index, params: { + namespace_id: project.namespace, + project_id: project + }, format: :json end @@ -185,7 +187,7 @@ describe Projects::PipelinesController do end def get_pipeline_json - get :show, namespace_id: project.namespace, project_id: project, id: pipeline, format: :json + get :show, params: { namespace_id: project.namespace, project_id: project, id: pipeline }, format: :json end def create_build(stage, stage_idx, name) @@ -240,12 +242,14 @@ describe Projects::PipelinesController do end def get_stage(name, params = {}) - get :stage, **params.merge( - namespace_id: project.namespace, - project_id: project, - id: pipeline.id, - stage: name, - format: :json) + get :stage, params: { +**params.merge( + namespace_id: project.namespace, + project_id: project, + id: pipeline.id, + stage: name, + format: :json) +} end end @@ -277,10 +281,12 @@ describe Projects::PipelinesController do end def get_stage_ajax(name) - get :stage_ajax, namespace_id: project.namespace, - project_id: project, - id: pipeline.id, - stage: name, + get :stage_ajax, params: { + namespace_id: project.namespace, + project_id: project, + id: pipeline.id, + stage: name + }, format: :json end end @@ -290,9 +296,11 @@ describe Projects::PipelinesController do let(:status) { pipeline.detailed_status(double('user')) } before do - get :status, namespace_id: project.namespace, - project_id: project, - id: pipeline.id, + get :status, params: { + namespace_id: project.namespace, + project_id: project, + id: pipeline.id + }, format: :json end @@ -310,9 +318,11 @@ describe Projects::PipelinesController do let!(:build) { create(:ci_build, :failed, pipeline: pipeline) } before do - post :retry, namespace_id: project.namespace, - project_id: project, - id: pipeline.id, + post :retry, params: { + namespace_id: project.namespace, + project_id: project, + id: pipeline.id + }, format: :json end @@ -337,9 +347,11 @@ describe Projects::PipelinesController do let!(:build) { create(:ci_build, :running, pipeline: pipeline) } before do - post :cancel, namespace_id: project.namespace, - project_id: project, - id: pipeline.id, + post :cancel, params: { + namespace_id: project.namespace, + project_id: project, + id: pipeline.id + }, format: :json end diff --git a/spec/controllers/projects/pipelines_settings_controller_spec.rb b/spec/controllers/projects/pipelines_settings_controller_spec.rb index b1ba9f74e38..269f105bed2 100644 --- a/spec/controllers/projects/pipelines_settings_controller_spec.rb +++ b/spec/controllers/projects/pipelines_settings_controller_spec.rb @@ -13,7 +13,7 @@ describe Projects::PipelinesSettingsController do describe 'GET show' do it 'redirects with 302 status code' do - get :show, namespace_id: project.namespace, project_id: project + get :show, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(302) end diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb index 519af10d78c..009f85903b5 100644 --- a/spec/controllers/projects/project_members_controller_spec.rb +++ b/spec/controllers/projects/project_members_controller_spec.rb @@ -6,7 +6,7 @@ describe Projects::ProjectMembersController do describe 'GET index' do it 'should have the project_members address with a 200 status code' do - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(200) end @@ -25,10 +25,12 @@ describe Projects::ProjectMembersController do end it 'returns 404' do - post :create, namespace_id: project.namespace, - project_id: project, - user_ids: project_user.id, - access_level: Gitlab::Access::GUEST + post :create, params: { + namespace_id: project.namespace, + project_id: project, + user_ids: project_user.id, + access_level: Gitlab::Access::GUEST + } expect(response).to have_gitlab_http_status(404) expect(project.users).not_to include project_user @@ -43,10 +45,12 @@ describe Projects::ProjectMembersController do it 'adds user to members' do expect_any_instance_of(Members::CreateService).to receive(:execute).and_return(status: :success) - post :create, namespace_id: project.namespace, - project_id: project, - user_ids: project_user.id, - access_level: Gitlab::Access::GUEST + post :create, params: { + namespace_id: project.namespace, + project_id: project, + user_ids: project_user.id, + access_level: Gitlab::Access::GUEST + } expect(response).to set_flash.to 'Users were successfully added.' expect(response).to redirect_to(project_project_members_path(project)) @@ -55,10 +59,12 @@ describe Projects::ProjectMembersController do it 'adds no user to members' do expect_any_instance_of(Members::CreateService).to receive(:execute).and_return(status: :failure, message: 'Message') - post :create, namespace_id: project.namespace, - project_id: project, - user_ids: '', - access_level: Gitlab::Access::GUEST + post :create, params: { + namespace_id: project.namespace, + project_id: project, + user_ids: '', + access_level: Gitlab::Access::GUEST + } expect(response).to set_flash.to 'Message' expect(response).to redirect_to(project_project_members_path(project)) @@ -95,9 +101,11 @@ describe Projects::ProjectMembersController do context 'when member is not found' do it 'returns 404' do - delete :destroy, namespace_id: project.namespace, - project_id: project, - id: 42 + delete :destroy, params: { + namespace_id: project.namespace, + project_id: project, + id: 42 + } expect(response).to have_gitlab_http_status(404) end @@ -110,9 +118,11 @@ describe Projects::ProjectMembersController do end it 'returns 404' do - delete :destroy, namespace_id: project.namespace, - project_id: project, - id: member + delete :destroy, params: { + namespace_id: project.namespace, + project_id: project, + id: member + } expect(response).to have_gitlab_http_status(404) expect(project.members).to include member @@ -125,9 +135,11 @@ describe Projects::ProjectMembersController do end it '[HTML] removes user from members' do - delete :destroy, namespace_id: project.namespace, - project_id: project, - id: member + delete :destroy, params: { + namespace_id: project.namespace, + project_id: project, + id: member + } expect(response).to redirect_to( project_project_members_path(project) @@ -154,8 +166,10 @@ describe Projects::ProjectMembersController do context 'when member is not found' do it 'returns 404' do - delete :leave, namespace_id: project.namespace, - project_id: project + delete :leave, params: { + namespace_id: project.namespace, + project_id: project + } expect(response).to have_gitlab_http_status(404) end @@ -168,8 +182,10 @@ describe Projects::ProjectMembersController do end it 'removes user from members' do - delete :leave, namespace_id: project.namespace, - project_id: project + delete :leave, params: { + namespace_id: project.namespace, + project_id: project + } expect(response).to set_flash.to "You left the \"#{project.human_name}\" project." expect(response).to redirect_to(dashboard_projects_path) @@ -185,8 +201,10 @@ describe Projects::ProjectMembersController do end it 'cannot remove themselves from the project' do - delete :leave, namespace_id: project.namespace, - project_id: project + delete :leave, params: { + namespace_id: project.namespace, + project_id: project + } expect(response).to have_gitlab_http_status(403) end @@ -198,8 +216,10 @@ describe Projects::ProjectMembersController do end it 'removes user from members' do - delete :leave, namespace_id: project.namespace, - project_id: project + delete :leave, params: { + namespace_id: project.namespace, + project_id: project + } expect(response).to set_flash.to 'Your access request to the project has been withdrawn.' expect(response).to redirect_to(project_path(project)) @@ -216,8 +236,10 @@ describe Projects::ProjectMembersController do end it 'creates a new ProjectMember that is not a team member' do - post :request_access, namespace_id: project.namespace, - project_id: project + post :request_access, params: { + namespace_id: project.namespace, + project_id: project + } expect(response).to set_flash.to 'Your request for access has been queued for review.' expect(response).to redirect_to( @@ -237,9 +259,11 @@ describe Projects::ProjectMembersController do context 'when member is not found' do it 'returns 404' do - post :approve_access_request, namespace_id: project.namespace, - project_id: project, - id: 42 + post :approve_access_request, params: { + namespace_id: project.namespace, + project_id: project, + id: 42 + } expect(response).to have_gitlab_http_status(404) end @@ -252,9 +276,11 @@ describe Projects::ProjectMembersController do end it 'returns 404' do - post :approve_access_request, namespace_id: project.namespace, - project_id: project, - id: member + post :approve_access_request, params: { + namespace_id: project.namespace, + project_id: project, + id: member + } expect(response).to have_gitlab_http_status(404) expect(project.members).not_to include member @@ -267,9 +293,11 @@ describe Projects::ProjectMembersController do end it 'adds user to members' do - post :approve_access_request, namespace_id: project.namespace, - project_id: project, - id: member + post :approve_access_request, params: { + namespace_id: project.namespace, + project_id: project, + id: member + } expect(response).to redirect_to( project_project_members_path(project) @@ -292,9 +320,11 @@ describe Projects::ProjectMembersController do shared_context 'import applied' do before do - post(:apply_import, namespace_id: project.namespace, - project_id: project, - source_project_id: another_project.id) + post(:apply_import, params: { + namespace_id: project.namespace, + project_id: project, + source_project_id: another_project.id + }) end end @@ -338,10 +368,12 @@ describe Projects::ProjectMembersController do it 'does not create a member' do expect do - post :create, user_ids: stranger.id, - namespace_id: project.namespace, - access_level: Member::OWNER, - project_id: project + post :create, params: { + user_ids: stranger.id, + namespace_id: project.namespace, + access_level: Member::OWNER, + project_id: project + } end.to change { project.members.count }.by(0) end end @@ -354,10 +386,12 @@ describe Projects::ProjectMembersController do it 'creates a member' do expect do - post :create, user_ids: stranger.id, - namespace_id: project.namespace, - access_level: Member::MAINTAINER, - project_id: project + post :create, params: { + user_ids: stranger.id, + namespace_id: project.namespace, + access_level: Member::MAINTAINER, + project_id: project + } end.to change { project.members.count }.by(1) end end diff --git a/spec/controllers/projects/prometheus/metrics_controller_spec.rb b/spec/controllers/projects/prometheus/metrics_controller_spec.rb index 5c56a712245..635763ce1d3 100644 --- a/spec/controllers/projects/prometheus/metrics_controller_spec.rb +++ b/spec/controllers/projects/prometheus/metrics_controller_spec.rb @@ -24,7 +24,7 @@ describe Projects::Prometheus::MetricsController do end it 'returns no content response' do - get :active_common, project_params(format: :json) + get :active_common, params: project_params(format: :json) expect(response).to have_gitlab_http_status(204) end @@ -38,7 +38,7 @@ describe Projects::Prometheus::MetricsController do end it 'returns no content response' do - get :active_common, project_params(format: :json) + get :active_common, params: project_params(format: :json) expect(response).to have_gitlab_http_status(200) expect(json_response).to eq(sample_response.deep_stringify_keys) @@ -47,7 +47,7 @@ describe Projects::Prometheus::MetricsController do context 'when requesting non json response' do it 'returns not found response' do - get :active_common, project_params + get :active_common, params: project_params expect(response).to have_gitlab_http_status(404) end @@ -62,7 +62,7 @@ describe Projects::Prometheus::MetricsController do allow(controller).to receive(:prometheus_adapter).and_return(prometheus_adapter) allow(prometheus_adapter).to receive(:query).with(:matched_metrics).and_return({}) - get :active_common, project_params(format: :json) + get :active_common, params: project_params(format: :json) expect(response).to have_gitlab_http_status(404) end @@ -70,7 +70,7 @@ describe Projects::Prometheus::MetricsController do context 'when prometheus_adapter is disabled' do it 'renders 404' do - get :active_common, project_params(format: :json) + get :active_common, params: project_params(format: :json) expect(response).to have_gitlab_http_status(404) end diff --git a/spec/controllers/projects/protected_branches_controller_spec.rb b/spec/controllers/projects/protected_branches_controller_spec.rb index ac812707e74..483d3bbc37c 100644 --- a/spec/controllers/projects/protected_branches_controller_spec.rb +++ b/spec/controllers/projects/protected_branches_controller_spec.rb @@ -15,7 +15,7 @@ describe Projects::ProtectedBranchesController do let(:project) { create(:project_empty_repo, :public) } it "redirects empty repo to projects page" do - get(:index, namespace_id: project.namespace.to_param, project_id: project) + get(:index, params: { namespace_id: project.namespace.to_param, project_id: project }) end end @@ -33,7 +33,7 @@ describe Projects::ProtectedBranchesController do it 'creates the protected branch rule' do expect do - post(:create, project_params.merge(protected_branch: create_params)) + post(:create, params: project_params.merge(protected_branch: create_params)) end.to change(ProtectedBranch, :count).by(1) end @@ -44,7 +44,7 @@ describe Projects::ProtectedBranchesController do end it "prevents creation of the protected branch rule" do - post(:create, project_params.merge(protected_branch: create_params)) + post(:create, params: project_params.merge(protected_branch: create_params)) expect(ProtectedBranch.count).to eq 0 end @@ -59,7 +59,7 @@ describe Projects::ProtectedBranchesController do end it 'updates the protected branch rule' do - put(:update, base_params.merge(protected_branch: update_params)) + put(:update, params: base_params.merge(protected_branch: update_params)) expect(protected_branch.reload.name).to eq('new_name') expect(json_response["name"]).to eq('new_name') @@ -74,7 +74,7 @@ describe Projects::ProtectedBranchesController do it "prevents update of the protected branch rule" do old_name = protected_branch.name - put(:update, base_params.merge(protected_branch: update_params)) + put(:update, params: base_params.merge(protected_branch: update_params)) expect(protected_branch.reload.name).to eq(old_name) end @@ -87,7 +87,7 @@ describe Projects::ProtectedBranchesController do end it "deletes the protected branch rule" do - delete(:destroy, base_params) + delete(:destroy, params: base_params) expect { ProtectedBranch.find(protected_branch.id) }.to raise_error(ActiveRecord::RecordNotFound) end @@ -99,7 +99,7 @@ describe Projects::ProtectedBranchesController do end it "prevents deletion of the protected branch rule" do - delete(:destroy, base_params) + delete(:destroy, params: base_params) expect(response.status).to eq(403) end diff --git a/spec/controllers/projects/protected_tags_controller_spec.rb b/spec/controllers/projects/protected_tags_controller_spec.rb index 20440c5a5d5..1553e081dee 100644 --- a/spec/controllers/projects/protected_tags_controller_spec.rb +++ b/spec/controllers/projects/protected_tags_controller_spec.rb @@ -5,7 +5,7 @@ describe Projects::ProtectedTagsController do let(:project) { create(:project_empty_repo, :public) } it "redirects empty repo to projects page" do - get(:index, namespace_id: project.namespace.to_param, project_id: project) + get(:index, params: { namespace_id: project.namespace.to_param, project_id: project }) end end @@ -20,7 +20,7 @@ describe Projects::ProtectedTagsController do end it "deletes the protected tag" do - delete(:destroy, namespace_id: project.namespace.to_param, project_id: project, id: protected_tag.id) + delete(:destroy, params: { namespace_id: project.namespace.to_param, project_id: project, id: protected_tag.id }) expect { ProtectedTag.find(protected_tag.id) }.to raise_error(ActiveRecord::RecordNotFound) end diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb index d3cd15fbcd7..24e2441cf9d 100644 --- a/spec/controllers/projects/raw_controller_spec.rb +++ b/spec/controllers/projects/raw_controller_spec.rb @@ -6,9 +6,11 @@ describe Projects::RawController do describe 'GET #show' do subject do get(:show, - namespace_id: project.namespace, - project_id: project, - id: filepath) + params: { + namespace_id: project.namespace, + project_id: project, + id: filepath + }) end context 'regular filename' do diff --git a/spec/controllers/projects/refs_controller_spec.rb b/spec/controllers/projects/refs_controller_spec.rb index ceaffd92623..ea299e1e8c5 100644 --- a/spec/controllers/projects/refs_controller_spec.rb +++ b/spec/controllers/projects/refs_controller_spec.rb @@ -12,10 +12,12 @@ describe Projects::RefsController do describe 'GET #logs_tree' do def default_get(format = :html) get :logs_tree, - namespace_id: project.namespace.to_param, - project_id: project, - id: 'master', - path: 'foo/bar/baz.html', + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: 'master', + path: 'foo/bar/baz.html' + }, format: format end diff --git a/spec/controllers/projects/registry/repositories_controller_spec.rb b/spec/controllers/projects/registry/repositories_controller_spec.rb index d11e42b411b..eca187af33d 100644 --- a/spec/controllers/projects/registry/repositories_controller_spec.rb +++ b/spec/controllers/projects/registry/repositories_controller_spec.rb @@ -111,15 +111,19 @@ describe Projects::Registry::RepositoriesController do end def go_to_index(format: :html) - get :index, namespace_id: project.namespace, - project_id: project, + get :index, params: { + namespace_id: project.namespace, + project_id: project + }, format: format end def delete_repository(repository) - delete :destroy, namespace_id: project.namespace, - project_id: project, - id: repository, + delete :destroy, params: { + namespace_id: project.namespace, + project_id: project, + id: repository + }, format: :json end end diff --git a/spec/controllers/projects/registry/tags_controller_spec.rb b/spec/controllers/projects/registry/tags_controller_spec.rb index 7fee8fd44ff..ed0197afcfc 100644 --- a/spec/controllers/projects/registry/tags_controller_spec.rb +++ b/spec/controllers/projects/registry/tags_controller_spec.rb @@ -65,9 +65,11 @@ describe Projects::Registry::TagsController do private def get_tags - get :index, namespace_id: project.namespace, - project_id: project, - repository_id: repository, + get :index, params: { + namespace_id: project.namespace, + project_id: project, + repository_id: repository + }, format: :json end end @@ -100,10 +102,12 @@ describe Projects::Registry::TagsController do private def destroy_tag(name) - post :destroy, namespace_id: project.namespace, - project_id: project, - repository_id: repository, - id: name, + post :destroy, params: { + namespace_id: project.namespace, + project_id: project, + repository_id: repository, + id: name + }, format: :json end end diff --git a/spec/controllers/projects/releases_controller_spec.rb b/spec/controllers/projects/releases_controller_spec.rb index d9fb6e0d838..f170a2ab613 100644 --- a/spec/controllers/projects/releases_controller_spec.rb +++ b/spec/controllers/projects/releases_controller_spec.rb @@ -60,6 +60,6 @@ describe Projects::ReleasesController do private def get_index - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } end end diff --git a/spec/controllers/projects/repositories_controller_spec.rb b/spec/controllers/projects/repositories_controller_spec.rb index a102a3a3c8c..5f4f6f8558f 100644 --- a/spec/controllers/projects/repositories_controller_spec.rb +++ b/spec/controllers/projects/repositories_controller_spec.rb @@ -6,7 +6,7 @@ describe Projects::RepositoriesController do describe "GET archive" do context 'as a guest' do it 'responds with redirect in correct format' do - get :archive, namespace_id: project.namespace, project_id: project, id: "master", format: "zip" + get :archive, params: { namespace_id: project.namespace, project_id: project, id: "master" }, format: "zip" expect(response.header["Content-Type"]).to start_with('text/html') expect(response).to be_redirect @@ -22,26 +22,26 @@ describe Projects::RepositoriesController do end it "uses Gitlab::Workhorse" do - get :archive, namespace_id: project.namespace, project_id: project, id: "master", format: "zip" + get :archive, params: { namespace_id: project.namespace, project_id: project, id: "master" }, format: "zip" expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-archive:") end it 'responds with redirect to the short name archive if fully qualified' do - get :archive, namespace_id: project.namespace, project_id: project, id: "master/#{project.path}-master", format: "zip" + get :archive, params: { namespace_id: project.namespace, project_id: project, id: "master/#{project.path}-master" }, format: "zip" expect(assigns(:ref)).to eq("master") expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-archive:") end it 'handles legacy queries with no ref' do - get :archive, namespace_id: project.namespace, project_id: project, format: "zip" + get :archive, params: { namespace_id: project.namespace, project_id: project }, format: "zip" expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-archive:") end it 'handles legacy queries with the ref specified as ref in params' do - get :archive, namespace_id: project.namespace, project_id: project, ref: 'feature', format: 'zip' + get :archive, params: { namespace_id: project.namespace, project_id: project, ref: 'feature' }, format: 'zip' expect(response).to have_gitlab_http_status(200) expect(assigns(:ref)).to eq('feature') @@ -49,7 +49,7 @@ describe Projects::RepositoriesController do end it 'handles legacy queries with the ref specified as id in params' do - get :archive, namespace_id: project.namespace, project_id: project, id: 'feature', format: 'zip' + get :archive, params: { namespace_id: project.namespace, project_id: project, id: 'feature' }, format: 'zip' expect(response).to have_gitlab_http_status(200) expect(assigns(:ref)).to eq('feature') @@ -57,7 +57,7 @@ describe Projects::RepositoriesController do end it 'prioritizes the id param over the ref param when both are specified' do - get :archive, namespace_id: project.namespace, project_id: project, id: 'feature', ref: 'feature_conflict', format: 'zip' + get :archive, params: { namespace_id: project.namespace, project_id: project, id: 'feature', ref: 'feature_conflict' }, format: 'zip' expect(response).to have_gitlab_http_status(200) expect(assigns(:ref)).to eq('feature') @@ -70,7 +70,7 @@ describe Projects::RepositoriesController do end it "renders Not Found" do - get :archive, namespace_id: project.namespace, project_id: project, id: "master", format: "zip" + get :archive, params: { namespace_id: project.namespace, project_id: project, id: "master" }, format: "zip" expect(response).to have_gitlab_http_status(404) end diff --git a/spec/controllers/projects/runners_controller_spec.rb b/spec/controllers/projects/runners_controller_spec.rb index b1e0b496ede..0baaa4e7192 100644 --- a/spec/controllers/projects/runners_controller_spec.rb +++ b/spec/controllers/projects/runners_controller_spec.rb @@ -23,7 +23,7 @@ describe Projects::RunnersController do new_desc = runner.description.swapcase expect do - post :update, params.merge(runner: { description: new_desc } ) + post :update, params: params.merge(runner: { description: new_desc } ) end.to change { runner.ensure_runner_queue_value } runner.reload @@ -35,7 +35,7 @@ describe Projects::RunnersController do describe '#destroy' do it 'destroys the runner' do - delete :destroy, params + delete :destroy, params: params expect(response).to have_gitlab_http_status(302) expect(Ci::Runner.find_by(id: runner.id)).to be_nil @@ -47,7 +47,7 @@ describe Projects::RunnersController do runner.update(active: false) expect do - post :resume, params + post :resume, params: params end.to change { runner.ensure_runner_queue_value } runner.reload @@ -62,7 +62,7 @@ describe Projects::RunnersController do runner.update(active: true) expect do - post :pause, params + post :pause, params: params end.to change { runner.ensure_runner_queue_value } runner.reload diff --git a/spec/controllers/projects/serverless/functions_controller_spec.rb b/spec/controllers/projects/serverless/functions_controller_spec.rb index 284b582b1f5..a9759c4fbd8 100644 --- a/spec/controllers/projects/serverless/functions_controller_spec.rb +++ b/spec/controllers/projects/serverless/functions_controller_spec.rb @@ -32,13 +32,13 @@ describe Projects::Serverless::FunctionsController do describe 'GET #index' do context 'empty cache' do it 'has no data' do - get :index, params({ format: :json }) + get :index, params: params({ format: :json }) expect(response).to have_gitlab_http_status(204) end it 'renders an html page' do - get :index, params + get :index, params: params expect(response).to have_gitlab_http_status(200) end @@ -51,7 +51,7 @@ describe Projects::Serverless::FunctionsController do end it 'has data' do - get :index, params({ format: :json }) + get :index, params: params({ format: :json }) expect(response).to have_gitlab_http_status(200) @@ -64,7 +64,7 @@ describe Projects::Serverless::FunctionsController do end it 'has data in html' do - get :index, params + get :index, params: params expect(response).to have_gitlab_http_status(200) end diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb index 0941af6779f..4a5d2bdecb7 100644 --- a/spec/controllers/projects/services_controller_spec.rb +++ b/spec/controllers/projects/services_controller_spec.rb @@ -16,7 +16,7 @@ describe Projects::ServicesController do it 'renders 404' do allow_any_instance_of(Service).to receive(:can_test?).and_return(false) - put :test, namespace_id: project.namespace, project_id: project, id: service.to_param + put :test, params: { namespace_id: project.namespace, project_id: project, id: service.to_param } expect(response).to have_gitlab_http_status(404) end @@ -26,7 +26,7 @@ describe Projects::ServicesController do let(:service_params) { { active: 'true', url: '' } } it 'returns error messages in JSON response' do - put :test, namespace_id: project.namespace, project_id: project, id: service.to_param, service: service_params + put :test, params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: service_params } expect(json_response['message']).to eq "Validations failed." expect(json_response['service_response']).to include "Url can't be blank" @@ -44,7 +44,7 @@ describe Projects::ServicesController do it 'returns success' do allow_any_instance_of(MicrosoftTeams::Notifier).to receive(:ping).and_return(true) - put :test, namespace_id: project.namespace, project_id: project, id: service.to_param + put :test, params: { namespace_id: project.namespace, project_id: project, id: service.to_param } expect(response.status).to eq(200) end @@ -54,7 +54,7 @@ describe Projects::ServicesController do stub_request(:get, 'http://example.com/rest/api/2/serverInfo') .to_return(status: 200, body: '{}') - put :test, namespace_id: project.namespace, project_id: project, id: service.to_param, service: service_params + put :test, params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: service_params } expect(response.status).to eq(200) end @@ -64,7 +64,7 @@ describe Projects::ServicesController do stub_request(:get, 'http://example.com/rest/api/2/serverInfo') .to_return(status: 200, body: '{}') - put :test, namespace_id: project.namespace, project_id: project, id: service.to_param, service: service_params + put :test, params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: service_params } expect(response.status).to eq(200) end @@ -91,10 +91,12 @@ describe Projects::ServicesController do end def do_put - put :test, namespace_id: project.namespace, - project_id: project, - id: 'buildkite', - service: { 'active' => '1', 'push_events' => '1', token: 'token', 'project_url' => 'http://test.com' } + put :test, params: { + namespace_id: project.namespace, + project_id: project, + id: 'buildkite', + service: { 'active' => '1', 'push_events' => '1', token: 'token', 'project_url' => 'http://test.com' } + } end end end @@ -104,7 +106,7 @@ describe Projects::ServicesController do stub_request(:get, 'http://example.com/rest/api/2/serverInfo') .to_return(status: 404) - put :test, namespace_id: project.namespace, project_id: project, id: service.to_param, service: service_params + put :test, params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: service_params } expect(response).to have_gitlab_http_status(200) expect(json_response).to eq( @@ -121,7 +123,7 @@ describe Projects::ServicesController do context 'when param `active` is set to true' do it 'activates the service and redirects to integrations paths' do put :update, - namespace_id: project.namespace, project_id: project, id: service.to_param, service: { active: true } + params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: { active: true } } expect(response).to redirect_to(project_settings_integrations_path(project)) expect(flash[:notice]).to eq 'JIRA activated.' @@ -131,7 +133,7 @@ describe Projects::ServicesController do context 'when param `active` is set to false' do it 'does not activate the service but saves the settings' do put :update, - namespace_id: project.namespace, project_id: project, id: service.to_param, service: { active: false } + params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: { active: false } } expect(flash[:notice]).to eq 'JIRA settings saved, but not activated.' end @@ -142,7 +144,7 @@ describe Projects::ServicesController do before do put :update, - namespace_id: project.namespace, project_id: project, id: service.to_param, service: { namespace: 'updated_namespace' } + params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: { namespace: 'updated_namespace' } } end it 'should not update the service' do @@ -154,7 +156,7 @@ describe Projects::ServicesController do describe "GET #edit" do before do - get :edit, namespace_id: project.namespace, project_id: project, id: service_id + get :edit, params: { namespace_id: project.namespace, project_id: project, id: service_id } end context 'with approved services' do diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb index 4629929f9af..41cc0607cee 100644 --- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb +++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb @@ -12,7 +12,7 @@ describe Projects::Settings::CiCdController do describe 'GET show' do it 'renders show with 200 status code' do - get :show, namespace_id: project.namespace, project_id: project + get :show, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(200) expect(response).to render_template(:show) @@ -29,7 +29,7 @@ describe Projects::Settings::CiCdController do it 'sets assignable project runners only' do group.add_maintainer(user) - get :show, namespace_id: project.namespace, project_id: project + get :show, params: { namespace_id: project.namespace, project_id: project } expect(assigns(:assignable_runners)).to contain_exactly(project_runner) end @@ -45,7 +45,7 @@ describe Projects::Settings::CiCdController do allow(ResetProjectCacheService).to receive_message_chain(:new, :execute).and_return(true) end - subject { post :reset_cache, namespace_id: project.namespace, project_id: project, format: :json } + subject { post :reset_cache, params: { namespace_id: project.namespace, project_id: project }, format: :json } it 'calls reset project cache service' do expect(ResetProjectCacheService).to receive_message_chain(:new, :execute) @@ -75,7 +75,7 @@ describe Projects::Settings::CiCdController do end describe 'PUT #reset_registration_token' do - subject { put :reset_registration_token, namespace_id: project.namespace, project_id: project } + subject { put :reset_registration_token, params: { namespace_id: project.namespace, project_id: project } } it 'resets runner registration token' do expect { subject }.to change { project.reload.runners_token } end @@ -92,9 +92,11 @@ describe Projects::Settings::CiCdController do subject do patch :update, - namespace_id: project.namespace.to_param, - project_id: project, - project: params + params: { + namespace_id: project.namespace.to_param, + project_id: project, + project: params + } end it 'redirects to the settings page' do diff --git a/spec/controllers/projects/settings/integrations_controller_spec.rb b/spec/controllers/projects/settings/integrations_controller_spec.rb index a2484c04c7a..8624eb4d1a0 100644 --- a/spec/controllers/projects/settings/integrations_controller_spec.rb +++ b/spec/controllers/projects/settings/integrations_controller_spec.rb @@ -11,7 +11,7 @@ describe Projects::Settings::IntegrationsController do describe 'GET show' do it 'renders show with 200 status code' do - get :show, namespace_id: project.namespace, project_id: project + get :show, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(200) expect(response).to render_template(:show) diff --git a/spec/controllers/projects/settings/repository_controller_spec.rb b/spec/controllers/projects/settings/repository_controller_spec.rb index 1c6ddfc1864..638cce60a25 100644 --- a/spec/controllers/projects/settings/repository_controller_spec.rb +++ b/spec/controllers/projects/settings/repository_controller_spec.rb @@ -11,7 +11,7 @@ describe Projects::Settings::RepositoryController do describe 'GET show' do it 'renders show with 200 status code' do - get :show, namespace_id: project.namespace, project_id: project + get :show, params: { namespace_id: project.namespace, project_id: project } expect(response).to have_gitlab_http_status(200) expect(response).to render_template(:show) @@ -24,7 +24,7 @@ describe Projects::Settings::RepositoryController do it 'enqueues a RepositoryCleanupWorker' do allow(RepositoryCleanupWorker).to receive(:perform_async) - put :cleanup, namespace_id: project.namespace, project_id: project, project: { object_map: object_map } + put :cleanup, params: { namespace_id: project.namespace, project_id: project, project: { object_map: object_map } } expect(response).to redirect_to project_settings_repository_path(project) expect(RepositoryCleanupWorker).to have_received(:perform_async).once diff --git a/spec/controllers/projects/snippets_controller_spec.rb b/spec/controllers/projects/snippets_controller_spec.rb index 9c383bd7628..1a3fb4da15f 100644 --- a/spec/controllers/projects/snippets_controller_spec.rb +++ b/spec/controllers/projects/snippets_controller_spec.rb @@ -17,16 +17,22 @@ describe Projects::SnippetsController do it 'redirects to last_page if page number is larger than number of pages' do get :index, - namespace_id: project.namespace, - project_id: project, page: (last_page + 1).to_param + params: { + namespace_id: project.namespace, + project_id: project, + page: (last_page + 1).to_param + } expect(response).to redirect_to(namespace_project_snippets_path(page: last_page)) end it 'redirects to specified page' do get :index, - namespace_id: project.namespace, - project_id: project, page: last_page.to_param + params: { + namespace_id: project.namespace, + project_id: project, + page: last_page.to_param + } expect(assigns(:snippets).current_page).to eq(last_page) expect(response).to have_gitlab_http_status(200) @@ -38,7 +44,7 @@ describe Projects::SnippetsController do context 'when anonymous' do it 'does not include the private snippet' do - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } expect(assigns(:snippets)).not_to include(project_snippet) expect(response).to have_gitlab_http_status(200) @@ -51,7 +57,7 @@ describe Projects::SnippetsController do end it 'renders the snippet' do - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } expect(assigns(:snippets)).to include(project_snippet) expect(response).to have_gitlab_http_status(200) @@ -64,7 +70,7 @@ describe Projects::SnippetsController do end it 'renders the snippet' do - get :index, namespace_id: project.namespace, project_id: project + get :index, params: { namespace_id: project.namespace, project_id: project } expect(assigns(:snippets)).to include(project_snippet) expect(response).to have_gitlab_http_status(200) @@ -79,7 +85,7 @@ describe Projects::SnippetsController do project.add_developer(user) - post :create, { + post :create, params: { namespace_id: project.namespace.to_param, project_id: project, project_snippet: { title: 'Title', content: 'Content', description: 'Description' }.merge(snippet_params) @@ -164,7 +170,7 @@ describe Projects::SnippetsController do project.add_developer(user) - put :update, { + put :update, params: { namespace_id: project.namespace.to_param, project_id: project, id: snippet.id, @@ -295,9 +301,11 @@ describe Projects::SnippetsController do sign_in(admin) post :mark_as_spam, - namespace_id: project.namespace, - project_id: project, - id: snippet.id + params: { + namespace_id: project.namespace, + project_id: project, + id: snippet.id + } end it 'updates the snippet' do @@ -314,7 +322,7 @@ describe Projects::SnippetsController do context 'when anonymous' do it 'responds with status 404' do - get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param + get action, params: { namespace_id: project.namespace, project_id: project, id: project_snippet.to_param } expect(response).to have_gitlab_http_status(404) end @@ -326,7 +334,7 @@ describe Projects::SnippetsController do end it 'renders the snippet' do - get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param + get action, params: { namespace_id: project.namespace, project_id: project, id: project_snippet.to_param } expect(assigns(:snippet)).to eq(project_snippet) expect(response).to have_gitlab_http_status(200) @@ -339,7 +347,7 @@ describe Projects::SnippetsController do end it 'renders the snippet' do - get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param + get action, params: { namespace_id: project.namespace, project_id: project, id: project_snippet.to_param } expect(assigns(:snippet)).to eq(project_snippet) expect(response).to have_gitlab_http_status(200) @@ -350,7 +358,7 @@ describe Projects::SnippetsController do context 'when the project snippet does not exist' do context 'when anonymous' do it 'responds with status 404' do - get action, namespace_id: project.namespace, project_id: project, id: 42 + get action, params: { namespace_id: project.namespace, project_id: project, id: 42 } expect(response).to have_gitlab_http_status(404) end @@ -362,7 +370,7 @@ describe Projects::SnippetsController do end it 'responds with status 404' do - get action, namespace_id: project.namespace, project_id: project, id: 42 + get action, params: { namespace_id: project.namespace, project_id: project, id: 42 } expect(response).to have_gitlab_http_status(404) end @@ -391,13 +399,13 @@ describe Projects::SnippetsController do end it 'returns LF line endings by default' do - get :raw, params + get :raw, params: params expect(response.body).to eq("first line\nsecond line\nthird line") end it 'does not convert line endings when parameter present' do - get :raw, params.merge(line_ending: :raw) + get :raw, params: params.merge(line_ending: :raw) expect(response.body).to eq("first line\r\nsecond line\r\nthird line") end diff --git a/spec/controllers/projects/tags_controller_spec.rb b/spec/controllers/projects/tags_controller_spec.rb index 6fbf75d0259..379430bff3b 100644 --- a/spec/controllers/projects/tags_controller_spec.rb +++ b/spec/controllers/projects/tags_controller_spec.rb @@ -7,7 +7,7 @@ describe Projects::TagsController do describe 'GET index' do before do - get :index, namespace_id: project.namespace.to_param, project_id: project + get :index, params: { namespace_id: project.namespace.to_param, project_id: project } end it 'returns the tags for the page' do @@ -22,7 +22,7 @@ describe Projects::TagsController do describe 'GET show' do before do - get :show, namespace_id: project.namespace.to_param, project_id: project, id: id + get :show, params: { namespace_id: project.namespace.to_param, project_id: project, id: id } end context "valid tag" do diff --git a/spec/controllers/projects/templates_controller_spec.rb b/spec/controllers/projects/templates_controller_spec.rb index d7f07aa2b01..01e53669627 100644 --- a/spec/controllers/projects/templates_controller_spec.rb +++ b/spec/controllers/projects/templates_controller_spec.rb @@ -20,7 +20,7 @@ describe Projects::TemplatesController do describe '#show' do it 'renders template name and content as json' do - get(:show, namespace_id: project.namespace.to_param, template_type: "issue", key: "bug", project_id: project, format: :json) + get(:show, params: { namespace_id: project.namespace.to_param, template_type: "issue", key: "bug", project_id: project }, format: :json) expect(response.status).to eq(200) expect(body["name"]).to eq("bug") @@ -29,21 +29,21 @@ describe Projects::TemplatesController do it 'renders 404 when unauthorized' do sign_in(user2) - get(:show, namespace_id: project.namespace.to_param, template_type: "issue", key: "bug", project_id: project, format: :json) + get(:show, params: { namespace_id: project.namespace.to_param, template_type: "issue", key: "bug", project_id: project }, format: :json) expect(response.status).to eq(404) end it 'renders 404 when template type is not found' do sign_in(user) - get(:show, namespace_id: project.namespace.to_param, template_type: "dont_exist", key: "bug", project_id: project, format: :json) + get(:show, params: { namespace_id: project.namespace.to_param, template_type: "dont_exist", key: "bug", project_id: project }, format: :json) expect(response.status).to eq(404) end it 'renders 404 without errors' do sign_in(user) - expect { get(:show, namespace_id: project.namespace.to_param, template_type: "dont_exist", key: "bug", project_id: project, format: :json) }.not_to raise_error + expect { get(:show, params: { namespace_id: project.namespace.to_param, template_type: "dont_exist", key: "bug", project_id: project }, format: :json) }.not_to raise_error end end end diff --git a/spec/controllers/projects/todos_controller_spec.rb b/spec/controllers/projects/todos_controller_spec.rb index 58f2817c7cc..987772f38aa 100644 --- a/spec/controllers/projects/todos_controller_spec.rb +++ b/spec/controllers/projects/todos_controller_spec.rb @@ -29,10 +29,12 @@ describe Projects::TodosController do describe 'POST create' do def post_create post :create, - namespace_id: project.namespace, - project_id: project, - issuable_id: issue.id, - issuable_type: 'issue', + params: { + namespace_id: project.namespace, + project_id: project, + issuable_id: issue.id, + issuable_type: 'issue' + }, format: 'html' end @@ -44,10 +46,12 @@ describe Projects::TodosController do describe 'POST create' do def post_create post :create, - namespace_id: project.namespace, - project_id: project, - issuable_id: merge_request.id, - issuable_type: 'merge_request', + params: { + namespace_id: project.namespace, + project_id: project, + issuable_id: merge_request.id, + issuable_type: 'merge_request' + }, format: 'html' end diff --git a/spec/controllers/projects/tree_controller_spec.rb b/spec/controllers/projects/tree_controller_spec.rb index 9982b49eebb..b15a2bc84a5 100644 --- a/spec/controllers/projects/tree_controller_spec.rb +++ b/spec/controllers/projects/tree_controller_spec.rb @@ -17,9 +17,11 @@ describe Projects::TreeController do before do get(:show, - namespace_id: project.namespace.to_param, - project_id: project, - id: id) + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: id + }) end context "valid branch, no path" do @@ -73,9 +75,11 @@ describe Projects::TreeController do before do get(:show, - namespace_id: project.namespace.to_param, - project_id: project, - id: id) + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: id + }) end context 'redirect to blob' do @@ -93,12 +97,14 @@ describe Projects::TreeController do before do post(:create_dir, - namespace_id: project.namespace.to_param, - project_id: project, - id: 'master', - dir_name: path, - branch_name: branch_name, - commit_message: 'Test commit message') + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: 'master', + dir_name: path, + branch_name: branch_name, + commit_message: 'Test commit message' + }) end context 'successful creation' do diff --git a/spec/controllers/projects/uploads_controller_spec.rb b/spec/controllers/projects/uploads_controller_spec.rb index 9802e4d5b1e..cfa67683dd3 100644 --- a/spec/controllers/projects/uploads_controller_spec.rb +++ b/spec/controllers/projects/uploads_controller_spec.rb @@ -12,7 +12,7 @@ describe Projects::UploadsController do context 'when the URL the old style, without /-/system' do it 'responds with a redirect to the login page' do - get :show, namespace_id: 'project', project_id: 'avatar', filename: 'foo.png', secret: 'bar' + get :show, params: { namespace_id: 'project', project_id: 'avatar', filename: 'foo.png', secret: 'bar' } expect(response).to redirect_to(new_user_session_path) end @@ -35,6 +35,6 @@ describe Projects::UploadsController do def post_authorize(verified: true) request.headers.merge!(workhorse_internal_api_request_header) if verified - post :authorize, namespace_id: model.namespace, project_id: model.path, format: :json + post :authorize, params: { namespace_id: model.namespace, project_id: model.path }, format: :json end end diff --git a/spec/controllers/projects/variables_controller_spec.rb b/spec/controllers/projects/variables_controller_spec.rb index 9afd1f751c6..8cceda72c28 100644 --- a/spec/controllers/projects/variables_controller_spec.rb +++ b/spec/controllers/projects/variables_controller_spec.rb @@ -13,7 +13,7 @@ describe Projects::VariablesController do let!(:variable) { create(:ci_variable, project: project) } subject do - get :show, namespace_id: project.namespace.to_param, project_id: project, format: :json + get :show, params: { namespace_id: project.namespace.to_param, project_id: project }, format: :json end include_examples 'GET #show lists all variables' @@ -25,9 +25,11 @@ describe Projects::VariablesController do subject do patch :update, - namespace_id: project.namespace.to_param, - project_id: project, - variables_attributes: variables_attributes, + params: { + namespace_id: project.namespace.to_param, + project_id: project, + variables_attributes: variables_attributes + }, format: :json end diff --git a/spec/controllers/projects/wikis_controller_spec.rb b/spec/controllers/projects/wikis_controller_spec.rb index b974d927856..341bf244397 100644 --- a/spec/controllers/projects/wikis_controller_spec.rb +++ b/spec/controllers/projects/wikis_controller_spec.rb @@ -20,7 +20,7 @@ describe Projects::WikisController do describe 'GET #show' do render_views - subject { get :show, namespace_id: project.namespace, project_id: project, id: wiki_title } + subject { get :show, params: { namespace_id: project.namespace, project_id: project, id: wiki_title } } it 'limits the retrieved pages for the sidebar' do expect(controller).to receive(:load_wiki).and_return(project_wiki) @@ -52,7 +52,7 @@ describe Projects::WikisController do let(:path) { upload_file_to_wiki(project, user, file_name) } - subject { get :show, namespace_id: project.namespace, project_id: project, id: path } + subject { get :show, params: { namespace_id: project.namespace, project_id: project, id: path } } context 'when file is an image' do let(:file_name) { 'dk.png' } @@ -142,14 +142,14 @@ describe Projects::WikisController do describe 'POST #preview_markdown' do it 'renders json in a correct format' do - post :preview_markdown, namespace_id: project.namespace, project_id: project, id: 'page/path', text: '*Markdown* text' + post :preview_markdown, params: { namespace_id: project.namespace, project_id: project, id: 'page/path', text: '*Markdown* text' } expect(JSON.parse(response.body).keys).to match_array(%w(body references)) end end describe 'GET #edit' do - subject { get(:edit, namespace_id: project.namespace, project_id: project, id: wiki_title) } + subject { get(:edit, params: { namespace_id: project.namespace, project_id: project, id: wiki_title }) } context 'when page content encoding is invalid' do it 'redirects to show' do @@ -178,10 +178,12 @@ describe Projects::WikisController do let(:new_content) { 'New content' } subject do patch(:update, - namespace_id: project.namespace, - project_id: project, - id: wiki_title, - wiki: { title: new_title, content: new_content }) + params: { + namespace_id: project.namespace, + project_id: project, + id: wiki_title, + wiki: { title: new_title, content: new_content } + }) end context 'when page content encoding is invalid' do |