diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-17 18:09:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-17 18:09:22 +0300 |
commit | 99f4b14cb0546a905d8f14f938d679d17e569005 (patch) | |
tree | d0520a58f46c8b5ceb018ca4d404e9a682f4af3c /spec/controllers | |
parent | 4f8983ade80c0d71d4c8e6cc0d686c9cecf5e7d4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
59 files changed, 632 insertions, 1053 deletions
diff --git a/spec/controllers/admin/spam_logs_controller_spec.rb b/spec/controllers/admin/spam_logs_controller_spec.rb index 51f7ecdece6..53eb107a251 100644 --- a/spec/controllers/admin/spam_logs_controller_spec.rb +++ b/spec/controllers/admin/spam_logs_controller_spec.rb @@ -33,10 +33,7 @@ RSpec.describe Admin::SpamLogsController do end.not_to change { SpamLog.count } expect(response).to have_gitlab_http_status(:found) - expect( - Users::GhostUserMigration.where(user: user, - initiator_user: admin) - ).to be_exists + expect(Users::GhostUserMigration.where(user: user, initiator_user: admin)).to be_exists expect(flash[:notice]).to eq("User #{user.username} was successfully removed.") end end diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 63e68118066..ec2559550c3 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -185,22 +185,14 @@ RSpec.describe Admin::UsersController do delete :destroy, params: { id: user.username }, format: :json expect(response).to have_gitlab_http_status(:ok) - expect( - Users::GhostUserMigration.where(user: user, - initiator_user: admin, - hard_delete: false) - ).to be_exists + expect(Users::GhostUserMigration.where(user: user, initiator_user: admin, hard_delete: false)).to be_exists end it 'initiates user removal and passes hard delete option' do delete :destroy, params: { id: user.username, hard_delete: true }, format: :json expect(response).to have_gitlab_http_status(:ok) - expect( - Users::GhostUserMigration.where(user: user, - initiator_user: admin, - hard_delete: true) - ).to be_exists + expect(Users::GhostUserMigration.where(user: user, initiator_user: admin, hard_delete: true)).to be_exists end context 'prerequisites for account deletion' do @@ -231,11 +223,7 @@ RSpec.describe Admin::UsersController do expect(response).to redirect_to(admin_users_path) expect(flash[:notice]).to eq(_('The user is being deleted.')) - expect( - Users::GhostUserMigration.where(user: user, - initiator_user: admin, - hard_delete: true) - ).to be_exists + expect(Users::GhostUserMigration.where(user: user, initiator_user: admin, hard_delete: true)).to be_exists end end end @@ -252,10 +240,7 @@ RSpec.describe Admin::UsersController do it 'initiates user removal', :sidekiq_inline do subject - expect( - Users::GhostUserMigration.where(user: user, - initiator_user: admin) - ).to be_exists + expect(Users::GhostUserMigration.where(user: user, initiator_user: admin)).to be_exists end it 'displays the rejection message' do diff --git a/spec/controllers/concerns/continue_params_spec.rb b/spec/controllers/concerns/continue_params_spec.rb index ba600b8156a..9ac7087430e 100644 --- a/spec/controllers/concerns/continue_params_spec.rb +++ b/spec/controllers/concerns/continue_params_spec.rb @@ -31,10 +31,7 @@ RSpec.describe ContinueParams do it 'cleans up any params that are not allowed' do allow(controller).to receive(:params) do - strong_continue_params(to: '/hello', - notice: 'world', - notice_now: '!', - something: 'else') + strong_continue_params(to: '/hello', notice: 'world', notice_now: '!', something: 'else') end expect(controller.continue_params.keys).to contain_exactly(*%w(to notice notice_now)) diff --git a/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb b/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb index a58b83dc42c..fc8b1efd226 100644 --- a/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb +++ b/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb @@ -25,9 +25,7 @@ RSpec.describe ControllerWithCrossProjectAccessCheck do # `described_class` is not available in this context include ControllerWithCrossProjectAccessCheck - requires_cross_project_access :index, show: false, - unless: -> { unless_condition }, - if: -> { if_condition } + requires_cross_project_access :index, show: false, unless: -> { unless_condition }, if: -> { if_condition } def index head :ok @@ -86,9 +84,10 @@ RSpec.describe ControllerWithCrossProjectAccessCheck do requires_cross_project_access - skip_cross_project_access_check index: true, show: false, - unless: -> { unless_condition }, - if: -> { if_condition } + skip_cross_project_access_check index: true, + show: false, + unless: -> { unless_condition }, + if: -> { if_condition } def index head :ok diff --git a/spec/controllers/concerns/product_analytics_tracking_spec.rb b/spec/controllers/concerns/product_analytics_tracking_spec.rb index 12b4065b89c..ed730d5c7f6 100644 --- a/spec/controllers/concerns/product_analytics_tracking_spec.rb +++ b/spec/controllers/concerns/product_analytics_tracking_spec.rb @@ -19,8 +19,13 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a include ProductAnalyticsTracking skip_before_action :authenticate_user!, only: :show - track_event(:index, :show, name: 'an_event', destinations: [:redis_hll, :snowplow], - conditions: [:custom_condition_one?, :custom_condition_two?]) { |controller| controller.get_custom_id } + track_event( + :index, + :show, + name: 'an_event', + destinations: [:redis_hll, :snowplow], + conditions: [:custom_condition_one?, :custom_condition_two?] + ) { |controller| controller.get_custom_id } def index render html: 'index' diff --git a/spec/controllers/concerns/renders_commits_spec.rb b/spec/controllers/concerns/renders_commits_spec.rb index 6a504681527..45f194b63e7 100644 --- a/spec/controllers/concerns/renders_commits_spec.rb +++ b/spec/controllers/concerns/renders_commits_spec.rb @@ -15,7 +15,7 @@ RSpec.describe RendersCommits do @merge_request = MergeRequest.find(params[:id]) @commits = set_commits_for_rendering( @merge_request.recent_commits.with_latest_pipeline(@merge_request.source_branch), - commits_count: @merge_request.commits_count + commits_count: @merge_request.commits_count ) render json: { html: view_to_html_string('projects/merge_requests/_commits') } diff --git a/spec/controllers/confirmations_controller_spec.rb b/spec/controllers/confirmations_controller_spec.rb index 773a416dcb4..b32cc892e8a 100644 --- a/spec/controllers/confirmations_controller_spec.rb +++ b/spec/controllers/confirmations_controller_spec.rb @@ -58,8 +58,7 @@ RSpec.describe ConfirmationsController do m.call(*args) expect(Gitlab::ApplicationContext.current) - .to include('meta.user' => user.username, - 'meta.caller_id' => 'ConfirmationsController#show') + .to include('meta.user' => user.username, 'meta.caller_id' => 'ConfirmationsController#show') end perform_request @@ -94,8 +93,7 @@ RSpec.describe ConfirmationsController do m.call(*args) expect(Gitlab::ApplicationContext.current) - .to include('meta.user' => user.username, - 'meta.caller_id' => 'ConfirmationsController#show') + .to include('meta.user' => user.username, 'meta.caller_id' => 'ConfirmationsController#show') end travel_to(3.days.from_now) { perform_request } diff --git a/spec/controllers/every_controller_spec.rb b/spec/controllers/every_controller_spec.rb index 902872b6e92..b76da85ad72 100644 --- a/spec/controllers/every_controller_spec.rb +++ b/spec/controllers/every_controller_spec.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'spec_helper' + RSpec.describe "Every controller" do context "feature categories" do let_it_be(:feature_categories) do @@ -52,7 +53,7 @@ RSpec.describe "Every controller" do non_existing_used_actions = used_actions - existing_actions expect(non_existing_used_actions).to be_empty, - "#{controller} used #{non_existing_used_actions} to define feature category, but the route does not exist" + "#{controller} used #{non_existing_used_actions} to define feature category, but the route does not exist" end end end diff --git a/spec/controllers/graphql_controller_spec.rb b/spec/controllers/graphql_controller_spec.rb index 7aad67b01e8..1f8845a55bf 100644 --- a/spec/controllers/graphql_controller_spec.rb +++ b/spec/controllers/graphql_controller_spec.rb @@ -43,8 +43,9 @@ RSpec.describe GraphqlController, feature_category: :integrations do post :execute expect(json_response).to include( - 'errors' => include(a_hash_including('message' => /Internal server error/, - 'raisedAt' => /graphql_controller_spec.rb/)) + 'errors' => include( + a_hash_including('message' => /Internal server error/, 'raisedAt' => /graphql_controller_spec.rb/) + ) ) end diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb index 4e5dc01f466..be3a0ff0ba5 100644 --- a/spec/controllers/groups/group_members_controller_spec.rb +++ b/spec/controllers/groups/group_members_controller_spec.rb @@ -489,13 +489,11 @@ RSpec.describe Groups::GroupMembersController do describe 'PUT #update' do it 'is successful' do - put :update, - params: { - group_member: { access_level: Gitlab::Access::GUEST }, - group_id: group, - id: membership - }, - format: :json + put :update, params: { + group_member: { access_level: Gitlab::Access::GUEST }, + group_id: group, + id: membership + }, format: :json expect(response).to have_gitlab_http_status(:ok) end diff --git a/spec/controllers/groups/milestones_controller_spec.rb b/spec/controllers/groups/milestones_controller_spec.rb index a3c4c47ab15..f4046cb97a0 100644 --- a/spec/controllers/groups/milestones_controller_spec.rb +++ b/spec/controllers/groups/milestones_controller_spec.rb @@ -230,11 +230,10 @@ RSpec.describe Groups::MilestonesController do describe "#create" do it "creates group milestone with Chinese title" do - post :create, - params: { - group_id: group.to_param, - milestone: milestone_params - } + post :create, params: { + group_id: group.to_param, + milestone: milestone_params + } milestone = Milestone.find_by_title(title) @@ -251,12 +250,11 @@ RSpec.describe Groups::MilestonesController do it "updates group milestone" do milestone_params[:title] = "title changed" - put :update, - params: { - id: milestone.iid, - group_id: group.to_param, - milestone: milestone_params - } + put :update, params: { + id: milestone.iid, + group_id: group.to_param, + milestone: milestone_params + } milestone.reload expect(response).to redirect_to(group_milestone_path(group, milestone.iid)) @@ -390,21 +388,19 @@ RSpec.describe Groups::MilestonesController do context 'for a non-GET request' do context 'when requesting the canonical path with different casing' do it 'does not 404' do - post :create, - params: { - group_id: group.to_param, - milestone: { title: title } - } + post :create, params: { + group_id: group.to_param, + milestone: { title: title } + } expect(response).not_to have_gitlab_http_status(:not_found) end it 'does not redirect to the correct casing' do - post :create, - params: { - group_id: group.to_param, - milestone: { title: title } - } + post :create, params: { + group_id: group.to_param, + milestone: { title: title } + } expect(response).not_to have_gitlab_http_status(:moved_permanently) end @@ -414,11 +410,10 @@ RSpec.describe Groups::MilestonesController do let(:redirect_route) { group.redirect_routes.create!(path: 'old-path') } it 'returns not found' do - post :create, - params: { - group_id: redirect_route.path, - milestone: { title: title } - } + post :create, params: { + group_id: redirect_route.path, + milestone: { title: title } + } expect(response).to have_gitlab_http_status(:not_found) end diff --git a/spec/controllers/groups/variables_controller_spec.rb b/spec/controllers/groups/variables_controller_spec.rb index 6dbe75bb1df..8c6efae89c3 100644 --- a/spec/controllers/groups/variables_controller_spec.rb +++ b/spec/controllers/groups/variables_controller_spec.rb @@ -77,12 +77,10 @@ RSpec.describe Groups::VariablesController do describe 'PATCH #update' do it 'is successful' do - patch :update, - params: { - group_id: group, - variables_attributes: [{ id: variable.id, key: 'hello' }] - }, - format: :json + patch :update, params: { + group_id: group, + variables_attributes: [{ id: variable.id, key: 'hello' }] + }, format: :json expect(response).to have_gitlab_http_status(:ok) end diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb index 2375146f346..ac6715bacd5 100644 --- a/spec/controllers/help_controller_spec.rb +++ b/spec/controllers/help_controller_spec.rb @@ -261,11 +261,7 @@ RSpec.describe HelpController do context 'for image formats' do context 'when requested file exists' do it 'renders the raw file' do - get :show, - params: { - path: 'user/img/markdown_logo' - }, - format: :png + get :show, params: { path: 'user/img/markdown_logo' }, format: :png aggregate_failures do expect(response).to be_successful @@ -277,11 +273,7 @@ RSpec.describe HelpController do context 'when requested file is missing' do it 'renders not found' do - get :show, - params: { - path: 'foo/bar' - }, - format: :png + get :show, params: { path: 'foo/bar' }, format: :png expect(response).to be_not_found end end @@ -289,11 +281,7 @@ RSpec.describe HelpController do context 'for other formats' do it 'always renders not found' do - get :show, - params: { - path: 'user/ssh' - }, - format: :foo + get :show, params: { path: 'user/ssh' }, format: :foo expect(response).to be_not_found end end diff --git a/spec/controllers/import/bitbucket_controller_spec.rb b/spec/controllers/import/bitbucket_controller_spec.rb index 35f712dc50d..055c98ebdbc 100644 --- a/spec/controllers/import/bitbucket_controller_spec.rb +++ b/spec/controllers/import/bitbucket_controller_spec.rb @@ -48,11 +48,13 @@ RSpec.describe Import::BitbucketController do let(:expires_at) { Time.current + 1.day } let(:expires_in) { 1.day } let(:access_token) do - double(token: token, - secret: secret, - expires_at: expires_at, - expires_in: expires_in, - refresh_token: refresh_token) + double( + token: token, + secret: secret, + expires_at: expires_at, + expires_in: expires_in, + refresh_token: refresh_token + ) end before do @@ -63,10 +65,10 @@ RSpec.describe Import::BitbucketController do allow_any_instance_of(OAuth2::Client) .to receive(:get_token) .with(hash_including( - 'grant_type' => 'authorization_code', - 'code' => code, - 'redirect_uri' => users_import_bitbucket_callback_url), - {}) + 'grant_type' => 'authorization_code', + 'code' => code, + 'redirect_uri' => users_import_bitbucket_callback_url), + {}) .and_return(access_token) stub_omniauth_provider('bitbucket') diff --git a/spec/controllers/import/bulk_imports_controller_spec.rb b/spec/controllers/import/bulk_imports_controller_spec.rb index a3992ae850e..4e7f9572f65 100644 --- a/spec/controllers/import/bulk_imports_controller_spec.rb +++ b/spec/controllers/import/bulk_imports_controller_spec.rb @@ -121,12 +121,12 @@ RSpec.describe Import::BulkImportsController, feature_category: :importers do params = { page: 1, per_page: 20, filter: '' }.merge(params_override) get :status, - params: params, - format: format, - session: { - bulk_import_gitlab_url: 'https://gitlab.example.com', - bulk_import_gitlab_access_token: 'demo-pat' - } + params: params, + format: format, + session: { + bulk_import_gitlab_url: 'https://gitlab.example.com', + bulk_import_gitlab_access_token: 'demo-pat' + } end include_context 'bulk imports requests context', 'https://gitlab.example.com' @@ -157,8 +157,7 @@ RSpec.describe Import::BulkImportsController, feature_category: :importers do end let(:source_version) do - Gitlab::VersionInfo.new(::BulkImport::MIN_MAJOR_VERSION, - ::BulkImport::MIN_MINOR_VERSION_FOR_PROJECT) + Gitlab::VersionInfo.new(::BulkImport::MIN_MAJOR_VERSION, ::BulkImport::MIN_MINOR_VERSION_FOR_PROJECT) end before do @@ -270,8 +269,7 @@ RSpec.describe Import::BulkImportsController, feature_category: :importers do context 'when connection error occurs' do let(:source_version) do - Gitlab::VersionInfo.new(::BulkImport::MIN_MAJOR_VERSION, - ::BulkImport::MIN_MINOR_VERSION_FOR_PROJECT) + Gitlab::VersionInfo.new(::BulkImport::MIN_MAJOR_VERSION, ::BulkImport::MIN_MINOR_VERSION_FOR_PROJECT) end before do diff --git a/spec/controllers/import/fogbugz_controller_spec.rb b/spec/controllers/import/fogbugz_controller_spec.rb index ed2a588eadf..e2d59fc213a 100644 --- a/spec/controllers/import/fogbugz_controller_spec.rb +++ b/spec/controllers/import/fogbugz_controller_spec.rb @@ -116,8 +116,7 @@ RSpec.describe Import::FogbugzController do describe 'GET status' do let(:repo) do - instance_double(Gitlab::FogbugzImport::Repository, - id: 'demo', name: 'vim', safe_name: 'vim', path: 'vim') + instance_double(Gitlab::FogbugzImport::Repository, id: 'demo', name: 'vim', safe_name: 'vim', path: 'vim') end it 'redirects to new page form when client is invalid' do diff --git a/spec/controllers/passwords_controller_spec.rb b/spec/controllers/passwords_controller_spec.rb index 9494f55c631..aad946acad4 100644 --- a/spec/controllers/passwords_controller_spec.rb +++ b/spec/controllers/passwords_controller_spec.rb @@ -99,8 +99,7 @@ RSpec.describe PasswordsController do m.call(*args) expect(Gitlab::ApplicationContext.current) - .to include('meta.user' => user.username, - 'meta.caller_id' => 'PasswordsController#update') + .to include('meta.user' => user.username, 'meta.caller_id' => 'PasswordsController#update') end subject diff --git a/spec/controllers/profiles_controller_spec.rb b/spec/controllers/profiles_controller_spec.rb index daf0f36c28b..b1c43a33386 100644 --- a/spec/controllers/profiles_controller_spec.rb +++ b/spec/controllers/profiles_controller_spec.rb @@ -11,8 +11,7 @@ RSpec.describe ProfilesController, :request_store do sign_in(user) new_password = User.random_password expect do - post :update, - params: { user: { password: new_password, password_confirmation: new_password } } + post :update, params: { user: { password: new_password, password_confirmation: new_password } } end.not_to change { user.reload.encrypted_password } expect(response).to have_gitlab_http_status(:found) @@ -23,8 +22,7 @@ RSpec.describe ProfilesController, :request_store do it 'allows an email update from a user without an external email address' do sign_in(user) - put :update, - params: { user: { email: "john@gmail.com", name: "John", validation_password: password } } + put :update, params: { user: { email: "john@gmail.com", name: "John", validation_password: password } } user.reload @@ -37,8 +35,7 @@ RSpec.describe ProfilesController, :request_store do create(:email, :confirmed, user: user, email: 'john@gmail.com') sign_in(user) - put :update, - params: { user: { email: "john@gmail.com", name: "John" } } + put :update, params: { user: { email: "john@gmail.com", name: "John" } } user.reload @@ -54,8 +51,7 @@ RSpec.describe ProfilesController, :request_store do ldap_user.create_user_synced_attributes_metadata(provider: 'ldap', name_synced: true, email_synced: true) sign_in(ldap_user) - put :update, - params: { user: { email: "john@gmail.com", name: "John" } } + put :update, params: { user: { email: "john@gmail.com", name: "John" } } ldap_user.reload @@ -71,8 +67,7 @@ RSpec.describe ProfilesController, :request_store do ldap_user.create_user_synced_attributes_metadata(provider: 'ldap', name_synced: true, email_synced: true, location_synced: false) sign_in(ldap_user) - put :update, - params: { user: { email: "john@gmail.com", name: "John", location: "City, Country" } } + put :update, params: { user: { email: "john@gmail.com", name: "John", location: "City, Country" } } ldap_user.reload @@ -85,10 +80,7 @@ RSpec.describe ProfilesController, :request_store do it 'allows setting a user status', :freeze_time do sign_in(user) - put( - :update, - params: { user: { status: { message: 'Working hard!', availability: 'busy', clear_status_after: '8_hours' } } } - ) + put :update, params: { user: { status: { message: 'Working hard!', availability: 'busy', clear_status_after: '8_hours' } } } expect(user.reload.status.message).to eq('Working hard!') expect(user.reload.status.availability).to eq('busy') @@ -183,22 +175,14 @@ RSpec.describe ProfilesController, :request_store do end it 'updates a username using JSON request' do - put :update_username, - params: { - user: { username: new_username } - }, - format: :json + put :update_username, params: { user: { username: new_username } }, format: :json expect(response).to have_gitlab_http_status(:ok) expect(json_response['message']).to eq(s_('Profiles|Username successfully changed')) end it 'renders an error message when the username was not updated' do - put :update_username, - params: { - user: { username: 'invalid username.git' } - }, - format: :json + put :update_username, params: { user: { username: 'invalid username.git' } }, format: :json expect(response).to have_gitlab_http_status(:unprocessable_entity) expect(json_response['message']).to match(/Username change failed/) diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb index 32cd10d9805..f35d8af165e 100644 --- a/spec/controllers/projects/artifacts_controller_spec.rb +++ b/spec/controllers/projects/artifacts_controller_spec.rb @@ -9,11 +9,13 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts let_it_be(:project) { create(:project, :repository, :public) } let_it_be(:pipeline, reload: true) do - create(:ci_pipeline, - project: project, - sha: project.commit.sha, - ref: project.default_branch, - status: 'success') + create( + :ci_pipeline, + project: project, + sha: project.commit.sha, + ref: project.default_branch, + status: 'success' + ) end let!(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline) } @@ -177,9 +179,10 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts end it 'sends the codequality report' do - expect(controller).to receive(:send_file) - .with(job.job_artifacts_codequality.file.path, - hash_including(disposition: 'attachment', filename: filename)).and_call_original + expect(controller).to receive(:send_file).with( + job.job_artifacts_codequality.file.path, + hash_including(disposition: 'attachment', filename: filename) + ).and_call_original download_artifact(file_type: file_type) @@ -555,8 +558,7 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts context 'with regular branch' do before do - pipeline.update!(ref: 'master', - sha: project.commit('master').sha) + pipeline.update!(ref: 'master', sha: project.commit('master').sha) get :latest_succeeded, params: params_from_ref('master') end @@ -566,8 +568,7 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts context 'with branch name containing slash' do before do - pipeline.update!(ref: 'improve/awesome', - sha: project.commit('improve/awesome').sha) + pipeline.update!(ref: 'improve/awesome', sha: project.commit('improve/awesome').sha) get :latest_succeeded, params: params_from_ref('improve/awesome') end @@ -577,8 +578,7 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts context 'with branch name and path containing slashes' do before do - pipeline.update!(ref: 'improve/awesome', - sha: project.commit('improve/awesome').sha) + pipeline.update!(ref: 'improve/awesome', sha: project.commit('improve/awesome').sha) get :latest_succeeded, params: params_from_ref('improve/awesome', job.name, 'file/README.md') end @@ -594,11 +594,13 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts before do create_file_in_repo(project, 'master', 'master', 'test.txt', 'This is test') - create(:ci_pipeline, + create( + :ci_pipeline, project: project, sha: project.commit.sha, ref: project.default_branch, - status: 'failed') + status: 'failed' + ) get :latest_succeeded, params: params_from_ref(project.default_branch) end diff --git a/spec/controllers/projects/blame_controller_spec.rb b/spec/controllers/projects/blame_controller_spec.rb index 62a544bb3fc..f322c78b5e3 100644 --- a/spec/controllers/projects/blame_controller_spec.rb +++ b/spec/controllers/projects/blame_controller_spec.rb @@ -17,12 +17,7 @@ RSpec.describe Projects::BlameController do render_views before do - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: id - }) + get :show, params: { namespace_id: project.namespace, project_id: project, id: id } end context "valid branch, valid file" do @@ -35,8 +30,7 @@ RSpec.describe Projects::BlameController do let(:id) { 'master/files/ruby/invalid-path.rb' } it 'redirects' do - expect(subject) - .to redirect_to("/#{project.full_path}/-/tree/master") + expect(subject).to redirect_to("/#{project.full_path}/-/tree/master") end end diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index 887a5ba598f..5e22be1c488 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -75,13 +75,7 @@ RSpec.describe Projects::BlobController do let(:id) { 'master/README.md' } before do - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: id - }, - format: :json) + get :show, params: { namespace_id: project.namespace, project_id: project, id: id }, format: :json end it do @@ -95,14 +89,7 @@ RSpec.describe Projects::BlobController do let(:id) { 'master/README.md' } before do - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: id, - viewer: 'none' - }, - format: :json) + get :show, params: { namespace_id: project.namespace, project_id: project, id: id, viewer: 'none' }, format: :json end it do @@ -115,12 +102,8 @@ RSpec.describe Projects::BlobController do context 'with tree path' do before do - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: id - }) + get :show, params: { namespace_id: project.namespace, project_id: project, id: id } + controller.instance_variable_set(:@blob, nil) end diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb index dcde22c1fd6..55c148bb66f 100644 --- a/spec/controllers/projects/branches_controller_spec.rb +++ b/spec/controllers/projects/branches_controller_spec.rb @@ -22,13 +22,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana before do sign_in(developer) - post :create, - params: { - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - ref: ref - } + post :create, params: { + namespace_id: project.namespace, + project_id: project, + branch_name: branch, + ref: ref + } end context "valid branch name, valid source" do @@ -83,13 +82,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana end it 'redirects' do - post :create, - params: { - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - issue_iid: issue.iid - } + post :create, 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") @@ -98,13 +96,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana it 'posts a system note' do expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, developer, "1-feature-branch", branch_project: project) - post :create, - params: { - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - issue_iid: issue.iid - } + post :create, params: { + namespace_id: project.namespace, + project_id: project, + branch_name: branch, + issue_iid: issue.iid + } end context 'confidential_issue_project_id is present' do @@ -167,13 +164,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana expect_any_instance_of(::Branches::CreateService).to receive(:execute).and_return(result) expect(SystemNoteService).to receive(:new_issue_branch).and_return(true) - post :create, - params: { - namespace_id: project.namespace.to_param, - project_id: project.to_param, - branch_name: branch, - issue_iid: issue.iid - } + post :create, 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 @@ -189,13 +185,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana expect_any_instance_of(::Branches::CreateService).to receive(:execute).and_return(result) expect(SystemNoteService).to receive(:new_issue_branch).and_return(true) - post :create, - params: { - namespace_id: project.namespace.to_param, - project_id: project.to_param, - branch_name: branch, - issue_iid: issue.iid - } + post :create, 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(:found) @@ -210,13 +205,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana expect_any_instance_of(::Branches::CreateService).to receive(:execute).and_return(result) expect(SystemNoteService).to receive(:new_issue_branch).and_return(true) - post :create, - params: { - namespace_id: project.namespace.to_param, - project_id: project.to_param, - branch_name: branch, - issue_iid: issue.iid - } + post :create, 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(:found) @@ -229,13 +223,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana it "doesn't post a system note" do expect(SystemNoteService).not_to receive(:new_issue_branch) - post :create, - params: { - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - issue_iid: issue.iid - } + post :create, params: { + namespace_id: project.namespace, + project_id: project, + branch_name: branch, + issue_iid: issue.iid + } end end @@ -249,13 +242,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana it "doesn't post a system note" do expect(SystemNoteService).not_to receive(:new_issue_branch) - post :create, - params: { - namespace_id: project.namespace, - project_id: project, - branch_name: branch, - issue_iid: issue.iid - } + post :create, params: { + namespace_id: project.namespace, + project_id: project, + branch_name: branch, + issue_iid: issue.iid + } end end end @@ -289,14 +281,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana end def create_branch(name:, ref:) - post :create, - format: :json, - params: { - namespace_id: project.namespace.to_param, - project_id: project.to_param, - branch_name: name, - ref: ref - } + post :create, format: :json, params: { + namespace_id: project.namespace.to_param, + project_id: project.to_param, + branch_name: name, + ref: ref + } end end @@ -345,13 +335,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana before do sign_in(developer) - post :destroy, - format: format, - params: { - id: branch, - namespace_id: project.namespace, - project_id: project - } + post :destroy, format: format, params: { + id: branch, + namespace_id: project.namespace, + project_id: project + } end context 'as JS' do @@ -445,11 +433,10 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana describe "DELETE destroy_all_merged" do def destroy_all_merged - delete :destroy_all_merged, - params: { - namespace_id: project.namespace, - project_id: project - } + delete :destroy_all_merged, params: { + namespace_id: project.namespace, + project_id: project + } end context 'when user is allowed to push' do @@ -492,13 +479,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana context 'when rendering a JSON format' do it 'filters branches by name' do - get :index, - format: :json, - params: { - namespace_id: project.namespace, - project_id: project, - search: 'master' - } + get :index, format: :json, params: { + namespace_id: project.namespace, + project_id: project, + search: 'master' + } expect(json_response.length).to eq 1 expect(json_response.first).to eq 'master' @@ -523,13 +508,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana status: :success, created_at: 2.months.ago) - get :index, - format: :html, - params: { - namespace_id: project.namespace, - project_id: project, - state: 'all' - } + get :index, format: :html, params: { + namespace_id: project.namespace, + project_id: project, + state: 'all' + } expect(assigns[:branch_pipeline_statuses]["master"].group).to eq("success") expect(assigns[:sort]).to eq('updated_desc') @@ -555,13 +538,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana status: :success, created_at: 2.months.ago) - get :index, - format: :html, - params: { - namespace_id: project.namespace, - project_id: project, - state: 'all' - } + get :index, format: :html, params: { + namespace_id: project.namespace, + project_id: project, + state: 'all' + } expect(assigns[:branch_pipeline_statuses]["master"].group).to eq("running") expect(assigns[:branch_pipeline_statuses]["test"].group).to eq("success") @@ -570,13 +551,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana context 'when a branch contains no pipelines' do it 'no commit statuses are received' do - get :index, - format: :html, - params: { - namespace_id: project.namespace, - project_id: project, - state: 'stale' - } + get :index, format: :html, params: { + namespace_id: project.namespace, + project_id: project, + state: 'stale' + } expect(assigns[:branch_pipeline_statuses]).to be_blank expect(assigns[:sort]).to eq('updated_asc') @@ -589,14 +568,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana # was not raised whenever the cache is enabled yet cold. context 'when cache is enabled yet cold', :request_store do it 'return with a status 200' do - get :index, - format: :html, - params: { - namespace_id: project.namespace, - project_id: project, - sort: 'name_asc', - state: 'all' - } + get :index, format: :html, params: { + namespace_id: project.namespace, + project_id: project, + sort: 'name_asc', + state: 'all' + } expect(response).to have_gitlab_http_status(:ok) expect(assigns[:sort]).to eq('name_asc') @@ -609,13 +586,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana end it 'return with a status 200' do - get :index, - format: :html, - params: { - namespace_id: project.namespace, - project_id: project, - state: 'all' - } + get :index, format: :html, params: { + namespace_id: project.namespace, + project_id: project, + state: 'all' + } expect(response).to have_gitlab_http_status(:ok) end @@ -623,37 +598,31 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana context 'when deprecated sort/search/page parameters are specified' do it 'returns with a status 301 when sort specified' do - get :index, - format: :html, - params: { - namespace_id: project.namespace, - project_id: project, - sort: 'updated_asc' - } + get :index, 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, - format: :html, - params: { - namespace_id: project.namespace, - project_id: project, - search: 'feature' - } + get :index, 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, - format: :html, - params: { - namespace_id: project.namespace, - project_id: project, - page: 2 - } + get :index, 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 @@ -747,13 +716,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana end it 'returns the commit counts behind and ahead of default branch' do - get :diverging_commit_counts, - format: :json, - params: { - namespace_id: project.namespace, - project_id: project, - names: %w[fix add-pdf-file branch-merged] - } + get :diverging_commit_counts, format: :json, params: { + namespace_id: project.namespace, + project_id: project, + names: %w[fix add-pdf-file branch-merged] + } expect(response).to have_gitlab_http_status(:ok) expect(json_response).to eq( @@ -766,12 +733,10 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana it 'returns the commits counts with no names provided' do allow_any_instance_of(Repository).to receive(:branch_count).and_return(Kaminari.config.default_per_page) - get :diverging_commit_counts, - format: :json, - params: { - namespace_id: project.namespace, - project_id: project - } + get :diverging_commit_counts, format: :json, params: { + namespace_id: project.namespace, + project_id: project + } expect(response).to have_gitlab_http_status(:ok) expect(json_response.count).to be > 1 @@ -783,25 +748,21 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana end it 'returns 422 if no names are specified' do - get :diverging_commit_counts, - format: :json, - params: { - namespace_id: project.namespace, - project_id: project - } + get :diverging_commit_counts, format: :json, params: { + namespace_id: project.namespace, + project_id: project + } expect(response).to have_gitlab_http_status(:unprocessable_entity) expect(json_response['error']).to eq("Specify at least one and at most #{Kaminari.config.default_per_page} branch names") end it 'returns the list of counts' do - get :diverging_commit_counts, - format: :json, - params: { - namespace_id: project.namespace, - project_id: project, - names: %w[fix add-pdf-file branch-merged] - } + get :diverging_commit_counts, format: :json, params: { + namespace_id: project.namespace, + project_id: project, + names: %w[fix add-pdf-file branch-merged] + } expect(response).to have_gitlab_http_status(:ok) expect(json_response.count).to be > 1 diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb index a4f7c92f5cd..38f72c769f3 100644 --- a/spec/controllers/projects/clusters_controller_spec.rb +++ b/spec/controllers/projects/clusters_controller_spec.rb @@ -420,11 +420,12 @@ RSpec.describe Projects::ClustersController, feature_category: :kubernetes_manag describe 'PUT update' do def go(format: :html) - put :update, params: 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 diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb index 8d3939d8133..1a925f2ea4d 100644 --- a/spec/controllers/projects/commit_controller_spec.rb +++ b/spec/controllers/projects/commit_controller_spec.rb @@ -155,12 +155,7 @@ RSpec.describe Projects::CommitController do let(:commit) { fork_project.commit('remove-submodule') } it 'renders it' do - get(:show, - params: { - namespace_id: fork_project.namespace, - project_id: fork_project, - id: commit.id - }) + get :show, params: { namespace_id: fork_project.namespace, project_id: fork_project, id: commit.id } expect(response).to be_successful end @@ -174,10 +169,10 @@ RSpec.describe Projects::CommitController do go(id: commit.id, merge_request_iid: merge_request.iid) expect(assigns(:new_diff_note_attrs)).to eq({ - noteable_type: 'MergeRequest', - noteable_id: merge_request.id, - commit_id: commit.id - }) + noteable_type: 'MergeRequest', + noteable_id: merge_request.id, + commit_id: commit.id + }) expect(response).to be_ok end end @@ -187,12 +182,7 @@ RSpec.describe Projects::CommitController do it 'contains branch and tags information' do commit = project.commit('5937ac0a7beb003549fc5fd26fc247adbce4a52e') - get(:branches, - params: { - namespace_id: project.namespace, - project_id: project, - id: commit.id - }) + get :branches, 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 @@ -205,12 +195,7 @@ RSpec.describe Projects::CommitController do allow_any_instance_of(Repository).to receive(:branch_count).and_return(1001) allow_any_instance_of(Repository).to receive(:tag_count).and_return(1001) - get(:branches, - params: { - namespace_id: project.namespace, - project_id: project, - id: commit.id - }) + get :branches, params: { namespace_id: project.namespace, project_id: project, id: commit.id } expect(assigns(:branches)).to eq([]) expect(assigns(:branches_limit_exceeded)).to be_truthy @@ -234,12 +219,7 @@ RSpec.describe Projects::CommitController do describe 'POST revert' do context 'when target branch is not provided' do it 'renders the 404 page' do - post(:revert, - params: { - namespace_id: project.namespace, - project_id: project, - id: commit.id - }) + post :revert, params: { namespace_id: project.namespace, project_id: project, id: commit.id } expect(response).not_to be_successful expect(response).to have_gitlab_http_status(:not_found) @@ -248,13 +228,7 @@ RSpec.describe Projects::CommitController do context 'when the revert commit is missing' do it 'renders the 404 page' do - post(:revert, - params: { - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: '1234567890' - }) + post :revert, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: '1234567890' } expect(response).not_to be_successful expect(response).to have_gitlab_http_status(:not_found) @@ -263,13 +237,7 @@ RSpec.describe Projects::CommitController do context 'when the revert was successful' do it 'redirects to the commits page' do - post(:revert, - params: { - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: commit.id - }) + post :revert, 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.') @@ -278,24 +246,12 @@ RSpec.describe Projects::CommitController do context 'when the revert failed' do before do - post(:revert, - params: { - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: commit.id - }) + post :revert, 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, - params: { - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: commit.id - }) + post :revert, 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.') @@ -306,12 +262,7 @@ RSpec.describe Projects::CommitController do describe 'POST cherry_pick' do context 'when target branch is not provided' do it 'renders the 404 page' do - post(:cherry_pick, - params: { - namespace_id: project.namespace, - project_id: project, - id: master_pickable_commit.id - }) + post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, id: master_pickable_commit.id } expect(response).not_to be_successful expect(response).to have_gitlab_http_status(:not_found) @@ -320,13 +271,7 @@ RSpec.describe Projects::CommitController do context 'when the cherry-pick commit is missing' do it 'renders the 404 page' do - post(:cherry_pick, - params: { - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: '1234567890' - }) + post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: '1234567890' } expect(response).not_to be_successful expect(response).to have_gitlab_http_status(:not_found) @@ -335,13 +280,7 @@ RSpec.describe Projects::CommitController do context 'when the cherry-pick was successful' do it 'redirects to the commits page' do - post(:cherry_pick, - params: { - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: master_pickable_commit.id - }) + post :cherry_pick, 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.') @@ -350,24 +289,12 @@ RSpec.describe Projects::CommitController do context 'when the cherry_pick failed' do before do - post(:cherry_pick, - params: { - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: master_pickable_commit.id - }) + post :cherry_pick, 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, - params: { - namespace_id: project.namespace, - project_id: project, - start_branch: 'master', - id: master_pickable_commit.id - }) + post :cherry_pick, 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.') @@ -381,15 +308,14 @@ RSpec.describe Projects::CommitController do let(:create_merge_request) { nil } def send_request - post(:cherry_pick, - params: { - namespace_id: forked_project.namespace, - project_id: forked_project, - target_project_id: target_project.id, - start_branch: 'feature', - id: forked_project.commit.id, - create_merge_request: create_merge_request - }) + post :cherry_pick, params: { + namespace_id: forked_project.namespace, + project_id: forked_project, + target_project_id: target_project.id, + start_branch: 'feature', + id: forked_project.commit.id, + create_merge_request: create_merge_request + } end def merge_request_url(source_project, branch) @@ -478,8 +404,7 @@ RSpec.describe Projects::CommitController do diff_for_path(id: commit2.id, old_path: existing_path, new_path: existing_path) expect(assigns(:diff_notes_disabled)).to be_falsey - expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'Commit', - commit_id: commit2.id) + expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'Commit', commit_id: commit2.id) end it 'only renders the diffs for the path given' do diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb index 67aa82dacbb..233f1044ed9 100644 --- a/spec/controllers/projects/commits_controller_spec.rb +++ b/spec/controllers/projects/commits_controller_spec.rb @@ -18,11 +18,7 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag describe "GET commits_root" do context "no ref is provided" do it 'redirects to the default branch of the project' do - get(:commits_root, - params: { - namespace_id: project.namespace, - project_id: project - }) + get :commits_root, params: { namespace_id: project.namespace, project_id: project } expect(response).to redirect_to project_commits_path(project) end @@ -34,12 +30,7 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag context 'with file path' do before do - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: id - }) + get :show, params: { namespace_id: project.namespace, project_id: project, id: id } end context "valid branch, valid file" do @@ -78,13 +69,7 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag offset: 0 ).and_call_original - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: id, - limit: "foo" - }) + get :show, params: { namespace_id: project.namespace, project_id: project, id: id, limit: "foo" } expect(response).to be_successful end @@ -98,12 +83,12 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag offset: 0 ).and_call_original - get(:show, params: { + get :show, params: { namespace_id: project.namespace, project_id: project, id: id, limit: { 'broken' => 'value' } - }) + } expect(response).to be_successful end @@ -113,12 +98,7 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag context "when the ref name ends in .atom" do context "when the ref does not exist with the suffix" do before do - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: "master.atom" - }) + get :show, params: { namespace_id: project.namespace, project_id: project, id: "master.atom" } end it "renders as atom" do @@ -138,12 +118,11 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag allow_any_instance_of(Repository).to receive(:commit).and_call_original allow_any_instance_of(Repository).to receive(:commit).with('master.atom').and_return(commit) - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: "master.atom" - }) + get :show, params: { + namespace_id: project.namespace, + project_id: project, + id: "master.atom" + } end it "renders as HTML" do @@ -182,13 +161,11 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag before do expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original unless id.include?(' ') - get(:signatures, - params: { - namespace_id: project.namespace, - project_id: project, - id: id - }, - format: :json) + get :signatures, params: { + namespace_id: project.namespace, + project_id: project, + id: id + }, format: :json end context "valid branch" do diff --git a/spec/controllers/projects/cycle_analytics_controller_spec.rb b/spec/controllers/projects/cycle_analytics_controller_spec.rb index 034e6104f99..2ad2189c020 100644 --- a/spec/controllers/projects/cycle_analytics_controller_spec.rb +++ b/spec/controllers/projects/cycle_analytics_controller_spec.rb @@ -15,11 +15,7 @@ RSpec.describe Projects::CycleAnalyticsController do it 'increases the counter' do expect(Gitlab::UsageDataCounters::CycleAnalyticsCounter).to receive(:count).with(:views) - get(:show, - params: { - namespace_id: project.namespace, - project_id: project - }) + get :show, params: { namespace_id: project.namespace, project_id: project } expect(response).to be_successful end diff --git a/spec/controllers/projects/deploy_keys_controller_spec.rb b/spec/controllers/projects/deploy_keys_controller_spec.rb index ec63bad22b5..52a605cf548 100644 --- a/spec/controllers/projects/deploy_keys_controller_spec.rb +++ b/spec/controllers/projects/deploy_keys_controller_spec.rb @@ -276,9 +276,9 @@ RSpec.describe Projects::DeployKeysController do let(:extra_params) { {} } subject do - put :update, params: extra_params.reverse_merge(id: deploy_key.id, - namespace_id: project.namespace, - project_id: project) + put :update, params: extra_params.reverse_merge( + id: deploy_key.id, namespace_id: project.namespace, project_id: project + ) end def deploy_key_params(title, can_push) @@ -330,9 +330,7 @@ RSpec.describe Projects::DeployKeysController do context 'when a different deploy key id param is injected' do let(:extra_params) { deploy_key_params('updated title', '1') } let(:hacked_params) do - extra_params.reverse_merge(id: other_deploy_key_id, - namespace_id: project.namespace, - project_id: project) + extra_params.reverse_merge(id: other_deploy_key_id, namespace_id: project.namespace, project_id: project) end subject { put :update, params: hacked_params } diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb index c6532e83441..a696eb933e9 100644 --- a/spec/controllers/projects/deployments_controller_spec.rb +++ b/spec/controllers/projects/deployments_controller_spec.rb @@ -210,8 +210,6 @@ RSpec.describe Projects::DeploymentsController do end def deployment_params(opts = {}) - opts.reverse_merge(namespace_id: project.namespace, - project_id: project, - environment_id: environment.id) + opts.reverse_merge(namespace_id: project.namespace, project_id: project, environment_id: environment.id) end end diff --git a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb index 5cc6e1b1bb4..1bb5112681c 100644 --- a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb +++ b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb @@ -139,10 +139,13 @@ RSpec.describe Projects::DesignManagement::Designs::ResizedImageController, feat let(:sha) { newest_version.sha } before do - create(:design, :with_smaller_image_versions, - issue: create(:issue, project: project), - versions_count: 1, - versions_sha: sha) + create( + :design, + :with_smaller_image_versions, + issue: create(:issue, project: project), + versions_count: 1, + versions_sha: sha + ) end it 'serves the newest image' do diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index 169fed1ab17..8ab41b233c2 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -44,17 +44,9 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d allow_any_instance_of(Environment).to receive(:has_terminals?).and_return(true) allow_any_instance_of(Environment).to receive(:rollout_status).and_return(kube_deployment_rollout_status) - create(:environment, project: project, - name: 'staging/review-1', - state: :available) - - create(:environment, project: project, - name: 'staging/review-2', - state: :available) - - create(:environment, project: project, - name: 'staging/review-3', - state: :stopped) + create(:environment, project: project, name: 'staging/review-1', state: :available) + create(:environment, project: project, name: 'staging/review-2', state: :available) + create(:environment, project: project, name: 'staging/review-3', state: :stopped) end let(:environments) { json_response['environments'] } @@ -84,9 +76,7 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d it 'ignores search option if is shorter than a minimum' do get :index, params: environment_params(format: :json, search: 'st') - expect(environments.map { |env| env['name'] }).to contain_exactly('production', - 'staging/review-1', - 'staging/review-2') + expect(environments.map { |env| env['name'] }).to contain_exactly('production', 'staging/review-1', 'staging/review-2') expect(json_response['available_count']).to eq 3 expect(json_response['stopped_count']).to eq 1 end @@ -96,9 +86,7 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d get :index, params: environment_params(format: :json, search: 'review') - expect(environments.map { |env| env['name'] }).to contain_exactly('review-app', - 'staging/review-1', - 'staging/review-2') + expect(environments.map { |env| env['name'] }).to contain_exactly('review-app', 'staging/review-1', 'staging/review-2') expect(json_response['available_count']).to eq 3 expect(json_response['stopped_count']).to eq 1 end @@ -245,23 +233,18 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d context 'when using JSON format' do before do - create(:environment, project: project, - name: 'staging-1.0/review', - state: :available) - create(:environment, project: project, - name: 'staging-1.0/zzz', - state: :available) + create(:environment, project: project, name: 'staging-1.0/review', state: :available) + create(:environment, project: project, name: 'staging-1.0/zzz', state: :available) end let(:environments) { json_response['environments'] } it 'sorts the subfolders lexicographically' do get :folder, params: { - namespace_id: project.namespace, - project_id: project, - id: 'staging-1.0' - }, - format: :json + namespace_id: project.namespace, + project_id: project, + id: 'staging-1.0' + }, format: :json expect(response).to be_ok expect(response).not_to render_template 'folder' @@ -1105,9 +1088,7 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d end def environment_params(opts = {}) - opts.reverse_merge(namespace_id: project.namespace, - project_id: project, - id: environment.id) + opts.reverse_merge(namespace_id: project.namespace, project_id: project, id: environment.id) end def additional_metrics(opts = {}) diff --git a/spec/controllers/projects/feature_flags_controller_spec.rb b/spec/controllers/projects/feature_flags_controller_spec.rb index 29ad51d590f..ac2e4233709 100644 --- a/spec/controllers/projects/feature_flags_controller_spec.rb +++ b/spec/controllers/projects/feature_flags_controller_spec.rb @@ -193,8 +193,7 @@ RSpec.describe Projects::FeatureFlagsController do it 'routes based on iid' do other_project = create(:project) other_project.add_developer(user) - other_feature_flag = create(:operations_feature_flag, project: other_project, - name: 'other_flag') + other_feature_flag = create(:operations_feature_flag, project: other_project, name: 'other_flag') params = { namespace_id: other_project.namespace, project_id: other_project, @@ -485,8 +484,7 @@ RSpec.describe Projects::FeatureFlagsController do context 'when creating a version 2 feature flag with a gitlabUserList strategy' do let!(:user_list) do - create(:operations_feature_flag_user_list, project: project, - name: 'My List', user_xids: 'user1,user2') + create(:operations_feature_flag_user_list, project: project, name: 'My List', user_xids: 'user1,user2') end let(:params) do @@ -627,10 +625,7 @@ RSpec.describe Projects::FeatureFlagsController do context 'with a version 2 feature flag' do let!(:new_version_flag) do - create(:operations_feature_flag, - name: 'new-feature', - active: true, - project: project) + create(:operations_feature_flag, name: 'new-feature', active: true, project: project) end it 'creates a new strategy and scope' do diff --git a/spec/controllers/projects/find_file_controller_spec.rb b/spec/controllers/projects/find_file_controller_spec.rb index a6c71cff74b..68810bae368 100644 --- a/spec/controllers/projects/find_file_controller_spec.rb +++ b/spec/controllers/projects/find_file_controller_spec.rb @@ -18,12 +18,7 @@ RSpec.describe Projects::FindFileController do render_views before do - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: id - }) + get :show, params: { namespace_id: project.namespace, project_id: project, id: id } end context "valid branch" do @@ -41,13 +36,7 @@ RSpec.describe Projects::FindFileController do describe "GET #list" do def go(format: 'json') - get :list, - params: { - namespace_id: project.namespace, - project_id: project, - id: id - }, - format: format + get :list, params: { namespace_id: project.namespace, project_id: project, id: id }, format: format end context "valid branch" do diff --git a/spec/controllers/projects/forks_controller_spec.rb b/spec/controllers/projects/forks_controller_spec.rb index 25c722173c1..3ea7054a64c 100644 --- a/spec/controllers/projects/forks_controller_spec.rb +++ b/spec/controllers/projects/forks_controller_spec.rb @@ -168,12 +168,7 @@ RSpec.describe Projects::ForksController, feature_category: :source_code_managem let(:format) { :html } subject(:do_request) do - get :new, - format: format, - params: { - namespace_id: project.namespace, - project_id: project - } + get :new, format: format, params: { namespace_id: project.namespace, project_id: project } end context 'when user is signed in' do diff --git a/spec/controllers/projects/grafana_api_controller_spec.rb b/spec/controllers/projects/grafana_api_controller_spec.rb index 90ab49f9467..ae863918d14 100644 --- a/spec/controllers/projects/grafana_api_controller_spec.rb +++ b/spec/controllers/projects/grafana_api_controller_spec.rb @@ -87,13 +87,15 @@ RSpec.describe Projects::GrafanaApiController, feature_category: :metrics do it 'returns a grafana datasource response' do get :proxy, params: params - expect(Grafana::ProxyService) - .to have_received(:new) - .with(project, '1', 'api/v1/query_range', - { 'query' => params[:query], - 'start' => params[:start_time], - 'end' => params[:end_time], - 'step' => params[:step] }) + expect(Grafana::ProxyService).to have_received(:new).with( + project, '1', 'api/v1/query_range', + { + 'query' => params[:query], + 'start' => params[:start_time], + 'end' => params[:end_time], + 'step' => params[:step] + } + ) expect(response).to have_gitlab_http_status(:ok) expect(json_response).to eq({}) diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index 9c272872a73..d0680fb379e 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -585,15 +585,13 @@ RSpec.describe Projects::IssuesController, feature_category: :team_planning do end def reorder_issue(issue, move_after_id: nil, move_before_id: nil) - put :reorder, - params: { - namespace_id: project.namespace.to_param, - project_id: project, - id: issue.iid, - move_after_id: move_after_id, - move_before_id: move_before_id - }, - format: :json + put :reorder, params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: issue.iid, + move_after_id: move_after_id, + move_before_id: move_before_id + }, format: :json end end @@ -601,14 +599,12 @@ RSpec.describe Projects::IssuesController, feature_category: :team_planning do let(:issue_params) { { title: 'New title' } } subject do - put :update, - params: { - namespace_id: project.namespace, - project_id: project, - id: issue.to_param, - issue: issue_params - }, - format: :json + put :update, params: { + namespace_id: project.namespace, + project_id: project, + id: issue.to_param, + issue: issue_params + }, format: :json end before do @@ -1927,12 +1923,11 @@ RSpec.describe Projects::IssuesController, feature_category: :team_planning do end it 'redirects from an old issue/designs correctly' do - get :designs, - params: { - namespace_id: project.namespace, - project_id: project, - id: issue - } + get :designs, params: { + namespace_id: project.namespace, + project_id: project, + id: issue + } expect(response).to redirect_to(designs_project_issue_path(new_project, issue)) expect(response).to have_gitlab_http_status(:moved_permanently) diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index 8fb9623c21a..cc4bca8d122 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -106,9 +106,10 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state, featu def create_job(name, status) user = create(:user) pipeline = create(:ci_pipeline, project: project, user: user) - create(:ci_build, :tags, :triggered, :artifacts, - pipeline: pipeline, name: name, status: status, - user: user) + create( + :ci_build, :tags, :triggered, :artifacts, + pipeline: pipeline, name: name, status: status, user: user + ) end end @@ -860,8 +861,7 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state, featu retried_build = Ci::Build.last Ci::Build.clone_accessors.each do |accessor| - expect(job.read_attribute(accessor)) - .to eq(retried_build.read_attribute(accessor)), + expect(job.read_attribute(accessor)).to eq(retried_build.read_attribute(accessor)), "Mismatched attribute on \"#{accessor}\". " \ "It was \"#{job.read_attribute(accessor)}\" but changed to \"#{retried_build.read_attribute(accessor)}\"" end @@ -883,10 +883,10 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state, featu def post_retry post :retry, params: { - namespace_id: project.namespace, - project_id: project, - id: job.id - } + namespace_id: project.namespace, + project_id: project, + id: job.id + } end end @@ -897,8 +897,7 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state, featu before do project.add_developer(user) - create(:protected_branch, :developers_can_merge, - name: 'protected-branch', project: project) + create(:protected_branch, :developers_can_merge, name: 'protected-branch', project: project) sign_in(user) end diff --git a/spec/controllers/projects/mattermosts_controller_spec.rb b/spec/controllers/projects/mattermosts_controller_spec.rb index 19a04654114..b5092a0f091 100644 --- a/spec/controllers/projects/mattermosts_controller_spec.rb +++ b/spec/controllers/projects/mattermosts_controller_spec.rb @@ -19,11 +19,10 @@ RSpec.describe Projects::MattermostsController do end it 'accepts the request' do - get(:new, - params: { - 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) end @@ -33,12 +32,11 @@ RSpec.describe Projects::MattermostsController do let(:mattermost_params) { { trigger: 'http://localhost:3000/trigger', team_id: 'abc' } } subject do - post(:create, - params: { - namespace_id: project.namespace.to_param, - project_id: project, - mattermost: mattermost_params - }) + post :create, 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 311af26abf6..356741fc4e2 100644 --- a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb @@ -22,13 +22,11 @@ RSpec.describe Projects::MergeRequests::ConflictsController do allow(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter) .to receive(:track_loading_conflict_ui_action) - get :show, - 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: 'html' + get :show, 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: 'html' end it 'does tracks the resolve call' do @@ -45,13 +43,11 @@ RSpec.describe Projects::MergeRequests::ConflictsController do allow(Gitlab::Git::Conflict::Parser).to receive(:parse) .and_raise(Gitlab::Git::Conflict::Parser::UnmergeableFile) - get :show, - 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' + get :show, 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 it 'returns a 200 status code' do @@ -70,13 +66,11 @@ RSpec.describe Projects::MergeRequests::ConflictsController do context 'with valid conflicts' do before do - get :show, - 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' + get :show, 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 it 'matches the schema' do @@ -130,15 +124,13 @@ RSpec.describe Projects::MergeRequests::ConflictsController do describe 'GET conflict_for_path' do def conflict_for_path(path) - get :conflict_for_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' + get :conflict_for_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 context 'when the conflicts cannot be resolved in the UI' do @@ -178,11 +170,13 @@ RSpec.describe Projects::MergeRequests::ConflictsController do aggregate_failures do expect(response).to have_gitlab_http_status(:ok) - expect(json_response).to include('old_path' => path, - 'new_path' => path, - 'blob_icon' => 'doc-text', - 'blob_path' => a_string_ending_with(path), - 'content' => content) + expect(json_response).to include( + 'old_path' => path, + 'new_path' => path, + 'blob_icon' => 'doc-text', + 'blob_path' => a_string_ending_with(path), + 'content' => content + ) end end end @@ -197,15 +191,13 @@ RSpec.describe Projects::MergeRequests::ConflictsController do end def resolve_conflicts(files) - post :resolve_conflicts, - 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' + post :resolve_conflicts, 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 3d4a884587f..c6a4dcbfdf0 100644 --- a/spec/controllers/projects/merge_requests/creations_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/creations_controller_spec.rb @@ -99,9 +99,7 @@ RSpec.describe Projects::MergeRequests::CreationsController, feature_category: : describe 'GET pipelines' do before do - create(:ci_pipeline, sha: fork_project.commit('remove-submodule').id, - ref: 'remove-submodule', - project: fork_project) + create(:ci_pipeline, sha: fork_project.commit('remove-submodule').id, ref: 'remove-submodule', project: fork_project) end it 'renders JSON including serialized pipelines' do @@ -188,13 +186,12 @@ RSpec.describe Projects::MergeRequests::CreationsController, feature_category: : expect(Ability).to receive(:allowed?).with(user, :read_project, project) { true } expect(Ability).to receive(:allowed?).with(user, :create_merge_request_in, project) { true }.at_least(:once) - get :branch_to, - params: { - namespace_id: fork_project.namespace, - project_id: fork_project, - target_project_id: project.id, - ref: 'master' - } + get :branch_to, 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(:ok) @@ -204,13 +201,12 @@ RSpec.describe Projects::MergeRequests::CreationsController, feature_category: : expect(Ability).to receive(:allowed?).with(user, :read_project, project) { true } expect(Ability).to receive(:allowed?).with(user, :create_merge_request_in, project) { false }.at_least(:once) - get :branch_to, - params: { - namespace_id: fork_project.namespace, - project_id: fork_project, - target_project_id: project.id, - ref: 'master' - } + get :branch_to, 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(:ok) @@ -220,13 +216,12 @@ RSpec.describe Projects::MergeRequests::CreationsController, feature_category: : expect(Ability).to receive(:allowed?).with(user, :read_project, project) { false } expect(Ability).to receive(:allowed?).with(user, :create_merge_request_in, project) { true }.at_least(:once) - get :branch_to, - params: { - namespace_id: fork_project.namespace, - project_id: fork_project, - target_project_id: project.id, - ref: 'master' - } + get :branch_to, 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(:ok) diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb index 23a33d7e0b1..a5dc351201d 100644 --- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb @@ -247,9 +247,11 @@ RSpec.describe Projects::MergeRequests::DiffsController, feature_category: :code straight: true) end - go(diff_head: true, - diff_id: merge_request.merge_request_diff.id, - start_sha: merge_request.merge_request_diff.start_commit_sha) + go( + diff_head: true, + diff_id: merge_request.merge_request_diff.id, + start_sha: merge_request.merge_request_diff.start_commit_sha + ) end end end @@ -329,9 +331,11 @@ RSpec.describe Projects::MergeRequests::DiffsController, feature_category: :code diff_for_path(old_path: existing_path, new_path: existing_path) expect(assigns(:diff_notes_disabled)).to be_falsey - expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'MergeRequest', - noteable_id: merge_request.id, - commit_id: nil) + expect(assigns(:new_diff_note_attrs)).to eq( + noteable_type: 'MergeRequest', + noteable_id: merge_request.id, + commit_id: nil + ) end it 'only renders the diffs for the path given' do @@ -528,8 +532,7 @@ RSpec.describe Projects::MergeRequests::DiffsController, feature_category: :code context 'with diff_id and start_sha params' do subject do - go(diff_id: merge_request.merge_request_diff.id, - start_sha: merge_request.merge_request_diff.start_commit_sha) + go(diff_id: merge_request.merge_request_diff.id, start_sha: merge_request.merge_request_diff.start_commit_sha) end it_behaves_like 'serializes diffs with expected arguments' do diff --git a/spec/controllers/projects/merge_requests/drafts_controller_spec.rb b/spec/controllers/projects/merge_requests/drafts_controller_spec.rb index 39482938a8b..6632473a85c 100644 --- a/spec/controllers/projects/merge_requests/drafts_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/drafts_controller_spec.rb @@ -299,8 +299,7 @@ RSpec.describe Projects::MergeRequests::DraftsController do it 'publishes a draft note with quick actions and applies them', :sidekiq_inline do project.add_developer(user2) - create(:draft_note, merge_request: merge_request, author: user, - note: "/assign #{user2.to_reference}") + create(:draft_note, merge_request: merge_request, author: user, note: "/assign #{user2.to_reference}") expect(merge_request.assignees).to be_empty @@ -350,12 +349,13 @@ RSpec.describe Projects::MergeRequests::DraftsController do let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } def create_reply(discussion_id, resolves: false) - create(:draft_note, - merge_request: merge_request, - author: user, - discussion_id: discussion_id, - resolve_discussion: resolves - ) + create( + :draft_note, + merge_request: merge_request, + author: user, + discussion_id: discussion_id, + resolve_discussion: resolves + ) end it 'resolves a thread if the draft note resolves it' do diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index ceb3f803db5..9e18089bb23 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -210,9 +210,7 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review diff = merge_request.merge_request_diff diff.clean! - diff.update!(real_size: nil, - start_commit_sha: nil, - base_commit_sha: nil) + diff.update!(real_size: nil, start_commit_sha: nil, base_commit_sha: nil) go(format: :html) @@ -270,24 +268,22 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review end it 'redirects from an old merge request correctly' do - get :show, - params: { - namespace_id: project.namespace, - project_id: project, - id: merge_request - } + get :show, params: { + namespace_id: project.namespace, + project_id: project, + id: merge_request + } expect(response).to redirect_to(project_merge_request_path(new_project, merge_request)) expect(response).to have_gitlab_http_status(:moved_permanently) end it 'redirects from an old merge request commits correctly' do - get :commits, - params: { - namespace_id: project.namespace, - project_id: project, - id: merge_request - } + get :commits, params: { + namespace_id: project.namespace, + project_id: project, + id: merge_request + } expect(response).to redirect_to(commits_project_merge_request_path(new_project, merge_request)) expect(response).to have_gitlab_http_status(:moved_permanently) @@ -385,13 +381,12 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) } def get_merge_requests(page = nil) - get :index, - params: { - namespace_id: project.namespace.to_param, - project_id: project, - state: 'opened', - page: page.to_param - } + get :index, 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 @@ -842,15 +837,13 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review describe 'GET commits' do def go(page: nil, per_page: 1, format: 'html') - get :commits, - params: { - namespace_id: project.namespace.to_param, - project_id: project, - id: merge_request.iid, - page: page, - per_page: per_page - }, - format: format + get :commits, params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: merge_request.iid, + page: page, + per_page: per_page + }, format: format end it 'renders the commits template to a string' do @@ -884,17 +877,18 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review describe 'GET pipelines' do before do - create(:ci_pipeline, project: merge_request.source_project, - ref: merge_request.source_branch, - sha: merge_request.diff_head_sha) + create( + :ci_pipeline, + project: merge_request.source_project, + ref: merge_request.source_branch, + sha: merge_request.diff_head_sha + ) - get :pipelines, - params: { - namespace_id: project.namespace.to_param, - project_id: project, - id: merge_request.iid - }, - format: :json + get :pipelines, params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: merge_request.iid + }, format: :json end context 'with "enabled" builds on a public project' do @@ -1955,17 +1949,18 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review let(:issue2) { create(:issue, project: project) } def post_assign_issues - merge_request.update!(description: "Closes #{issue1.to_reference} and #{issue2.to_reference}", - author: user, - source_branch: 'feature', - target_branch: 'master') + merge_request.update!( + description: "Closes #{issue1.to_reference} and #{issue2.to_reference}", + author: user, + source_branch: 'feature', + target_branch: 'master' + ) - post :assign_related_issues, - params: { - namespace_id: project.namespace.to_param, - project_id: project, - id: merge_request.iid - } + post :assign_related_issues, params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: merge_request.iid + } end it 'displays an flash error message on fail' do @@ -2143,10 +2138,13 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review describe 'GET pipeline_status.json' do context 'when head_pipeline exists' do let!(:pipeline) do - create(:ci_pipeline, project: merge_request.source_project, - ref: merge_request.source_branch, - sha: merge_request.diff_head_sha, - head_pipeline_of: merge_request) + create( + :ci_pipeline, + project: merge_request.source_project, + ref: merge_request.source_branch, + sha: merge_request.diff_head_sha, + head_pipeline_of: merge_request + ) end let(:status) { pipeline.detailed_status(double('user')) } @@ -2199,11 +2197,10 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review def get_pipeline_status get :pipeline_status, params: { - namespace_id: project.namespace, - project_id: project, - id: merge_request.iid - }, - format: :json + namespace_id: project.namespace, + project_id: project, + id: merge_request.iid + }, format: :json end end diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 23b0b58158f..1f913e10f43 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -484,10 +484,7 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: : let(:commit) { create(:commit, project: project) } let(:existing_comment) do - create(:note_on_commit, - note: 'first', - project: project, - commit_id: merge_request.commit_shas.first) + create(:note_on_commit, note: 'first', project: project, commit_id: merge_request.commit_shas.first) end let(:discussion) { existing_comment.discussion } diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index 4e0c098ad81..d41848c1231 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -203,18 +203,16 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte def get_pipelines_index_html(params = {}) get :index, params: { - namespace_id: project.namespace, - project_id: project - }.merge(params), - format: :html + namespace_id: project.namespace, + project_id: project + }.merge(params), format: :html end def get_pipelines_index_json(params = {}) get :index, params: { - namespace_id: project.namespace, - project_id: project - }.merge(params), - format: :json + namespace_id: project.namespace, + project_id: project + }.merge(params), format: :json end def create_all_pipeline_types @@ -236,12 +234,15 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte def create_pipeline(status, sha, merge_request: nil) user = create(:user) - pipeline = create(:ci_empty_pipeline, status: status, - project: project, - sha: sha.id, - ref: sha.id.first(8), - user: user, - merge_request: merge_request) + pipeline = create( + :ci_empty_pipeline, + status: status, + project: project, + sha: sha.id, + ref: sha.id.first(8), + user: user, + merge_request: merge_request + ) build_stage = create(:ci_stage, name: 'build', pipeline: pipeline) test_stage = create(:ci_stage, name: 'test', pipeline: pipeline) @@ -378,9 +379,7 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte let(:project) { create(:project, :repository) } let(:pipeline) do - create(:ci_empty_pipeline, project: project, - user: user, - sha: project.commit.id) + create(:ci_empty_pipeline, project: project, user: user, sha: project.commit.id) end let(:build_stage) { create(:ci_stage, name: 'build', pipeline: pipeline) } @@ -598,9 +597,7 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte def create_pipeline(project) create(:ci_empty_pipeline, project: project).tap do |pipeline| - create(:ci_build, pipeline: pipeline, - ci_stage: create(:ci_stage, name: 'test', pipeline: pipeline), - name: 'rspec') + create(:ci_build, pipeline: pipeline, ci_stage: create(:ci_stage, name: 'test', pipeline: pipeline), name: 'rspec') end end @@ -771,11 +768,8 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte before do get :status, params: { - namespace_id: project.namespace, - project_id: project, - id: pipeline.id - }, - format: :json + namespace_id: project.namespace, project_id: project, id: pipeline.id + }, format: :json end it 'return a detailed pipeline status in json' do @@ -868,9 +862,7 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte context 'when latest commit contains [ci skip]' do before do - project.repository.create_file(user, 'new-file.txt', 'A new file', - message: '[skip ci] This is a test', - branch_name: 'master') + project.repository.create_file(user, 'new-file.txt', 'A new file', message: '[skip ci] This is a test', branch_name: 'master') end it_behaves_like 'creates a pipeline' @@ -906,11 +898,8 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte subject do post :create, params: { - namespace_id: project.namespace, - project_id: project, - pipeline: { ref: 'master' } - }, - format: :json + namespace_id: project.namespace, project_id: project, pipeline: { ref: 'master' } + }, format: :json end before do @@ -969,11 +958,8 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte describe 'POST retry.json' do subject(:post_retry) do post :retry, params: { - namespace_id: project.namespace, - project_id: project, - id: pipeline.id - }, - format: :json + namespace_id: project.namespace, project_id: project, id: pipeline.id + }, format: :json end let!(:pipeline) { create(:ci_pipeline, :failed, project: project) } @@ -1036,11 +1022,8 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte before do post :cancel, params: { - namespace_id: project.namespace, - project_id: project, - id: pipeline.id - }, - format: :json + namespace_id: project.namespace, project_id: project, id: pipeline.id + }, format: :json end it 'cancels a pipeline without returning any content', :sidekiq_might_not_need_inline do @@ -1192,17 +1175,11 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte let(:branch_secondary) { project.repository.branches[1] } let!(:pipeline_master) do - create(:ci_pipeline, - ref: branch_main.name, - sha: branch_main.target, - project: project) + create(:ci_pipeline, ref: branch_main.name, sha: branch_main.target, project: project) end let!(:pipeline_secondary) do - create(:ci_pipeline, - ref: branch_secondary.name, - sha: branch_secondary.target, - project: project) + create(:ci_pipeline, ref: branch_secondary.name, sha: branch_secondary.target, project: project) end before do @@ -1455,10 +1432,9 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte private def get_config_variables - get :config_variables, params: { namespace_id: project.namespace, - project_id: project, - sha: ref }, - format: :json + get :config_variables, params: { + namespace_id: project.namespace, project_id: project, sha: ref + }, format: :json end end diff --git a/spec/controllers/projects/prometheus/alerts_controller_spec.rb b/spec/controllers/projects/prometheus/alerts_controller_spec.rb index 09b9f25c0c6..91d3ba7e106 100644 --- a/spec/controllers/projects/prometheus/alerts_controller_spec.rb +++ b/spec/controllers/projects/prometheus/alerts_controller_spec.rb @@ -117,10 +117,7 @@ RSpec.describe Projects::Prometheus::AlertsController do describe 'GET #metrics_dashboard' do let!(:alert) do - create(:prometheus_alert, - project: project, - environment: environment, - prometheus_metric: metric) + create(:prometheus_alert, project: project, environment: environment, prometheus_metric: metric) end it 'returns a json object with the correct keys' do diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb index 40252cf65cd..b15a37d8d90 100644 --- a/spec/controllers/projects/raw_controller_spec.rb +++ b/spec/controllers/projects/raw_controller_spec.rb @@ -12,13 +12,9 @@ RSpec.describe Projects::RawController, feature_category: :source_code_managemen describe 'GET #show' do def get_show - get(:show, - params: { - namespace_id: project.namespace, - project_id: project, - id: file_path, - inline: inline - }.merge(params)) + get :show, params: { + namespace_id: project.namespace, project_id: project, id: file_path, inline: inline + }.merge(params) end subject { get_show } diff --git a/spec/controllers/projects/refs_controller_spec.rb b/spec/controllers/projects/refs_controller_spec.rb index a0d119baf16..0b1d0b75de7 100644 --- a/spec/controllers/projects/refs_controller_spec.rb +++ b/spec/controllers/projects/refs_controller_spec.rb @@ -54,14 +54,9 @@ RSpec.describe Projects::RefsController, feature_category: :source_code_manageme let(:path) { 'foo/bar/baz.html' } def default_get(format = :html) - get :logs_tree, - params: { - namespace_id: project.namespace.to_param, - project_id: project, - id: 'master', - path: path - }, - format: format + get :logs_tree, params: { + namespace_id: project.namespace.to_param, project_id: project, id: 'master', path: path + }, format: format end def xhr_get(format = :html, params = {}) diff --git a/spec/controllers/projects/registry/repositories_controller_spec.rb b/spec/controllers/projects/registry/repositories_controller_spec.rb index 59bc1ba04e7..834fdddd583 100644 --- a/spec/controllers/projects/registry/repositories_controller_spec.rb +++ b/spec/controllers/projects/registry/repositories_controller_spec.rb @@ -59,8 +59,7 @@ RSpec.describe Projects::Registry::RepositoriesController do context 'when root container repository is not created' do context 'when there are tags for this repository' do before do - stub_container_registry_tags(repository: :any, - tags: %w[rc1 latest]) + stub_container_registry_tags(repository: :any, tags: %w[rc1 latest]) end it 'creates a root container repository' do @@ -139,19 +138,12 @@ RSpec.describe Projects::Registry::RepositoriesController do end def go_to_index(format: :html, params: {}) - get :index, params: params.merge({ - namespace_id: project.namespace, - project_id: project - }), - format: format + get :index, params: params.merge({ namespace_id: project.namespace, project_id: project }), format: format end def delete_repository(repository) delete :destroy, params: { - namespace_id: project.namespace, - project_id: project, - id: repository - }, - format: :json + 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 7b786f4a8af..afa7bd6a60d 100644 --- a/spec/controllers/projects/registry/tags_controller_spec.rb +++ b/spec/controllers/projects/registry/tags_controller_spec.rb @@ -76,11 +76,8 @@ RSpec.describe Projects::Registry::TagsController do def get_tags get :index, params: { - namespace_id: project.namespace, - project_id: project, - repository_id: repository - }, - format: :json + namespace_id: project.namespace, project_id: project, repository_id: repository + }, format: :json end end @@ -121,12 +118,11 @@ RSpec.describe Projects::Registry::TagsController do def destroy_tag(name) post :destroy, params: { - namespace_id: project.namespace, - project_id: project, - repository_id: repository, - id: name - }, - format: :json + namespace_id: project.namespace, + project_id: project, + repository_id: repository, + id: name + }, format: :json end end @@ -162,12 +158,11 @@ RSpec.describe Projects::Registry::TagsController do def bulk_destroy_tags(names) post :bulk_destroy, params: { - namespace_id: project.namespace, - project_id: project, - repository_id: repository, - ids: names - }, - format: :json + namespace_id: project.namespace, + project_id: project, + repository_id: repository, + ids: names + }, format: :json end end diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb index ba917fa3a31..1c332eadc42 100644 --- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb +++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb @@ -173,12 +173,11 @@ RSpec.describe Projects::Settings::CiCdController, feature_category: :continuous let(:params) { { ci_config_path: '' } } subject do - patch :update, - params: { - namespace_id: project.namespace.to_param, - project_id: project, - project: params - } + patch :update, params: { + namespace_id: project.namespace.to_param, + project_id: project, + project: params + } end it 'redirects to the settings page' do @@ -241,9 +240,7 @@ RSpec.describe Projects::Settings::CiCdController, feature_category: :continuous end it 'creates a pipeline', :sidekiq_inline do - project.repository.create_file(user, 'Gemfile', 'Gemfile contents', - message: 'Add Gemfile', - branch_name: 'master') + project.repository.create_file(user, 'Gemfile', 'Gemfile contents', message: 'Add Gemfile', branch_name: 'master') expect { subject }.to change { Ci::Pipeline.count }.by(1) end diff --git a/spec/controllers/projects/settings/merge_requests_controller_spec.rb b/spec/controllers/projects/settings/merge_requests_controller_spec.rb index 106ec62bea0..398fc97a00d 100644 --- a/spec/controllers/projects/settings/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/settings/merge_requests_controller_spec.rb @@ -36,12 +36,11 @@ RSpec.describe Projects::Settings::MergeRequestsController do merge_method: :ff } - put :update, - params: { - namespace_id: project.namespace, - project_id: project.id, - project: params - } + put :update, params: { + namespace_id: project.namespace, + project_id: project.id, + project: params + } expect(response).to redirect_to project_settings_merge_requests_path(project) params.each do |param, value| diff --git a/spec/controllers/projects/snippets/blobs_controller_spec.rb b/spec/controllers/projects/snippets/blobs_controller_spec.rb index ca656705e07..4d12452e3d5 100644 --- a/spec/controllers/projects/snippets/blobs_controller_spec.rb +++ b/spec/controllers/projects/snippets/blobs_controller_spec.rb @@ -26,15 +26,14 @@ RSpec.describe Projects::Snippets::BlobsController do let(:inline) { nil } subject do - get(:raw, - params: { - namespace_id: project.namespace, - project_id: project, - snippet_id: snippet, - path: filepath, - ref: ref, - inline: inline - }) + get :raw, params: { + namespace_id: project.namespace, + project_id: project, + snippet_id: snippet, + path: filepath, + ref: ref, + inline: inline + } end context 'with a snippet without a repository' do diff --git a/spec/controllers/projects/snippets_controller_spec.rb b/spec/controllers/projects/snippets_controller_spec.rb index a388fc4620f..119e52480db 100644 --- a/spec/controllers/projects/snippets_controller_spec.rb +++ b/spec/controllers/projects/snippets_controller_spec.rb @@ -102,12 +102,11 @@ RSpec.describe Projects::SnippetsController do project.add_maintainer(admin) sign_in(admin) - post :mark_as_spam, - params: { - namespace_id: project.namespace, - project_id: project, - id: snippet.id - } + post :mark_as_spam, params: { + namespace_id: project.namespace, + project_id: project, + id: snippet.id + } end it 'updates the snippet', :enable_admin_mode do diff --git a/spec/controllers/projects/tree_controller_spec.rb b/spec/controllers/projects/tree_controller_spec.rb index 9bc3065b6da..2b3adc719c1 100644 --- a/spec/controllers/projects/tree_controller_spec.rb +++ b/spec/controllers/projects/tree_controller_spec.rb @@ -21,12 +21,9 @@ RSpec.describe Projects::TreeController do before do expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original - get(:show, - params: { - 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 branch, no path" do @@ -113,12 +110,9 @@ RSpec.describe Projects::TreeController do allow(::Gitlab::GitalyClient).to receive(:call).and_call_original expect(::Gitlab::GitalyClient).not_to receive(:call).with(anything, :commit_service, :find_commit, anything, anything) - get(:show, - params: { - 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 + } expect(response).to have_gitlab_http_status(:not_found) end @@ -128,12 +122,9 @@ RSpec.describe Projects::TreeController do render_views before do - get(:show, - params: { - 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 'redirect to blob' do @@ -141,8 +132,7 @@ RSpec.describe Projects::TreeController do it 'redirects' do redirect_url = "/#{project.full_path}/-/blob/master/README.md" - expect(subject) - .to redirect_to(redirect_url) + expect(subject).to redirect_to(redirect_url) end end end @@ -151,15 +141,14 @@ RSpec.describe Projects::TreeController do render_views before do - post(:create_dir, - params: { - namespace_id: project.namespace.to_param, - project_id: project, - id: 'master', - dir_name: path, - branch_name: branch_name, - commit_message: 'Test commit message' - }) + post :create_dir, 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_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 51f8a3b1197..3ba106a7dff 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -508,11 +508,7 @@ RSpec.describe ProjectsController, feature_category: :projects do it 'allows an admin user to access the page', :enable_admin_mode do sign_in(create(:user, :admin)) - get :edit, - params: { - namespace_id: project.namespace.path, - id: project.path - } + get :edit, params: { namespace_id: project.namespace.path, id: project.path } expect(response).to have_gitlab_http_status(:ok) end @@ -521,11 +517,7 @@ RSpec.describe ProjectsController, feature_category: :projects do sign_in(user) project.add_maintainer(user) - get :edit, - params: { - namespace_id: project.namespace.path, - id: project.path - } + get :edit, params: { namespace_id: project.namespace.path, id: project.path } expect(assigns(:badge_api_endpoint)).not_to be_nil end @@ -543,10 +535,7 @@ RSpec.describe ProjectsController, feature_category: :projects do before do group.add_owner(user) - post :archive, params: { - namespace_id: project.namespace.path, - id: project.path - } + post :archive, params: { namespace_id: project.namespace.path, id: project.path } end it 'archives the project' do @@ -790,12 +779,7 @@ RSpec.describe ProjectsController, feature_category: :projects do merge_method: :ff } - put :update, - params: { - namespace_id: project.namespace, - id: project.id, - project: params - } + put :update, params: { namespace_id: project.namespace, id: project.id, project: params } expect(response).to have_gitlab_http_status(:found) params.each do |param, value| @@ -811,22 +795,12 @@ RSpec.describe ProjectsController, feature_category: :projects do } expect do - put :update, - params: { - namespace_id: project.namespace, - id: project.id, - project: params - } + put :update, params: { namespace_id: project.namespace, id: project.id, project: params } end.not_to change { project.namespace.reload } end def update_project(**parameters) - put :update, - params: { - namespace_id: project.namespace.path, - id: project.path, - project: parameters - } + put :update, params: { namespace_id: project.namespace.path, id: project.path, project: parameters } end end @@ -850,12 +824,9 @@ RSpec.describe ProjectsController, feature_category: :projects do it_behaves_like 'unauthorized when external service denies access' do subject do - put :update, - params: { - namespace_id: project.namespace, - id: project, - project: { description: 'Hello world' } - } + put :update, params: { + namespace_id: project.namespace, id: project, project: { description: 'Hello world' } + } project.reload end @@ -975,13 +946,9 @@ RSpec.describe ProjectsController, feature_category: :projects do old_namespace = project.namespace - put :transfer, - params: { - namespace_id: old_namespace.path, - new_namespace_id: new_namespace_id, - id: project.path - }, - format: :js + put :transfer, params: { + namespace_id: old_namespace.path, new_namespace_id: new_namespace_id, id: project.path + }, format: :js project.reload @@ -994,13 +961,9 @@ RSpec.describe ProjectsController, feature_category: :projects do it 'updates namespace' do sign_in(admin) - put :transfer, - params: { - namespace_id: project.namespace.path, - new_namespace_id: new_namespace.id, - id: project.path - }, - format: :js + put :transfer, params: { + namespace_id: project.namespace.path, new_namespace_id: new_namespace.id, id: project.path + }, format: :js project.reload @@ -1120,32 +1083,19 @@ RSpec.describe ProjectsController, feature_category: :projects do it "toggles star if user is signed in" do sign_in(user) expect(user.starred?(public_project)).to be_falsey - post(:toggle_star, - params: { - namespace_id: public_project.namespace, - id: public_project - }) + + post :toggle_star, params: { namespace_id: public_project.namespace, id: public_project } expect(user.starred?(public_project)).to be_truthy - post(:toggle_star, - params: { - namespace_id: public_project.namespace, - id: public_project - }) + + post :toggle_star, params: { namespace_id: public_project.namespace, id: public_project } expect(user.starred?(public_project)).to be_falsey end it "does nothing if user is not signed in" do - post(:toggle_star, - params: { - namespace_id: project.namespace, - id: public_project - }) + post :toggle_star, params: { namespace_id: project.namespace, id: public_project } expect(user.starred?(public_project)).to be_falsey - post(:toggle_star, - params: { - namespace_id: project.namespace, - id: public_project - }) + + post :toggle_star, params: { namespace_id: project.namespace, id: public_project } expect(user.starred?(public_project)).to be_falsey end end @@ -1160,12 +1110,9 @@ RSpec.describe ProjectsController, feature_category: :projects do let(:forked_project) { fork_project(create(:project, :public), user) } it 'removes fork from project' do - delete(:remove_fork, - params: { - namespace_id: forked_project.namespace.to_param, - id: forked_project.to_param - }, - format: :js) + delete :remove_fork, params: { + namespace_id: forked_project.namespace.to_param, id: forked_project.to_param + }, format: :js expect(forked_project.reload.forked?).to be_falsey expect(flash[:notice]).to eq(s_('The fork relationship has been removed.')) @@ -1177,12 +1124,9 @@ RSpec.describe ProjectsController, feature_category: :projects do let(:unforked_project) { create(:project, namespace: user.namespace) } it 'does nothing if project was not forked' do - delete(:remove_fork, - params: { - namespace_id: unforked_project.namespace, - id: unforked_project - }, - format: :js) + delete :remove_fork, params: { + namespace_id: unforked_project.namespace, id: unforked_project + }, format: :js expect(flash[:notice]).to be_nil expect(response).to redirect_to(edit_project_path(unforked_project)) @@ -1191,12 +1135,10 @@ RSpec.describe ProjectsController, feature_category: :projects do end it "does nothing if user is not signed in" do - delete(:remove_fork, - params: { - namespace_id: project.namespace, - id: project - }, - format: :js) + delete :remove_fork, params: { + namespace_id: project.namespace, id: project + }, format: :js + expect(response).to have_gitlab_http_status(:unauthorized) end end @@ -1761,12 +1703,7 @@ RSpec.describe ProjectsController, feature_category: :projects do service_desk_enabled: true } - put :update, - params: { - namespace_id: project.namespace, - id: project, - project: params - } + put :update, params: { namespace_id: project.namespace, id: project, project: params } project.reload expect(response).to have_gitlab_http_status(:found) diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb index b217b100349..54b8f0c6f3b 100644 --- a/spec/controllers/registrations_controller_spec.rb +++ b/spec/controllers/registrations_controller_spec.rb @@ -756,8 +756,7 @@ RSpec.describe RegistrationsController, feature_category: :user_profile do m.call(*args) expect(Gitlab::ApplicationContext.current) - .to include('meta.user' => user.username, - 'meta.caller_id' => 'RegistrationsController#destroy') + .to include('meta.user' => user.username, 'meta.caller_id' => 'RegistrationsController#destroy') end post :destroy diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb index 0f7f4a1910b..6f8d059780c 100644 --- a/spec/controllers/search_controller_spec.rb +++ b/spec/controllers/search_controller_spec.rb @@ -227,8 +227,7 @@ RSpec.describe SearchController, feature_category: :global_search do let(:label) { 'redis_hll_counters.search.search_total_unique_counts_monthly' } let(:property) { 'i_search_total' } let(:context) do - [Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll, - event: property).to_context] + [Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll, event: property).to_context] end let(:namespace) { create(:group) } diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 1f7d169bae5..77ec72e72dd 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -375,8 +375,7 @@ RSpec.describe SessionsController do context 'when OTP is valid for another user' do it 'does not authenticate' do - authenticate_2fa(login: another_user.username, - otp_attempt: another_user.current_otp) + authenticate_2fa(login: another_user.username, otp_attempt: another_user.current_otp) expect(subject.current_user).not_to eq another_user end @@ -384,8 +383,7 @@ RSpec.describe SessionsController do context 'when OTP is invalid for another user' do it 'does not authenticate' do - authenticate_2fa(login: another_user.username, - otp_attempt: 'invalid') + authenticate_2fa(login: another_user.username, otp_attempt: 'invalid') expect(subject.current_user).not_to eq another_user end @@ -567,8 +565,7 @@ RSpec.describe SessionsController do it 'sets the username and caller_id in the context' do expect(controller).to receive(:destroy).and_wrap_original do |m, *args| expect(Gitlab::ApplicationContext.current) - .to include('meta.user' => user.username, - 'meta.caller_id' => 'SessionsController#destroy') + .to include('meta.user' => user.username, 'meta.caller_id' => 'SessionsController#destroy') m.call(*args) end @@ -607,8 +604,7 @@ RSpec.describe SessionsController do m.call(*args) end - post(:create, - params: { user: { login: user.username, password: user.password.succ } }) + post :create, params: { user: { login: user.username, password: user.password.succ } } end end end diff --git a/spec/controllers/snippets/blobs_controller_spec.rb b/spec/controllers/snippets/blobs_controller_spec.rb index b9f58587a58..b92621d4041 100644 --- a/spec/controllers/snippets/blobs_controller_spec.rb +++ b/spec/controllers/snippets/blobs_controller_spec.rb @@ -17,13 +17,7 @@ RSpec.describe Snippets::BlobsController do let(:inline) { nil } subject do - get(:raw, - params: { - snippet_id: snippet, - path: filepath, - ref: ref, - inline: inline - }) + get :raw, params: { snippet_id: snippet, path: filepath, ref: ref, inline: inline } end where(:snippet_visibility_level, :user, :status) do |