Merge branch '239356-fix-Layout/HashAlignment_34' into 'master'

Fix Layout/HashAlignment offenses 34

See merge request gitlab-org/gitlab!95971

.rubocop_todo/layout/hash_alignment.yml

@@ -22,26 +22,6 @@ Layout/HashAlignment:
     - 'ee/spec/lib/gitlab/elastic/indexer_spec.rb'
     - 'ee/spec/lib/gitlab/insights/loader_spec.rb'
     - 'ee/spec/lib/gitlab/template/custom_templates_spec.rb'
-    - 'ee/spec/services/arkose/blocked_users_report_service_spec.rb'
-    - 'ee/spec/services/audit_events/protected_branch_audit_event_service_spec.rb'
-    - 'ee/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb'
-    - 'ee/spec/services/ci/create_pipeline_service/cross_needs_artifacts_spec.rb'
-    - 'ee/spec/services/ci/process_pipeline_service_spec.rb'
-    - 'ee/spec/services/ci/retry_pipeline_service_spec.rb'
-    - 'ee/spec/services/ci/subscribe_bridge_service_spec.rb'
-    - 'ee/spec/services/ee/merge_requests/create_pipeline_service_spec.rb'
-    - 'ee/spec/services/merge_trains/check_status_service_spec.rb'
-    - 'ee/spec/services/merge_trains/create_pipeline_service_spec.rb'
-    - 'ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb'
-    - 'ee/spec/services/merge_trains/refresh_service_spec.rb'
-    - 'ee/spec/services/status_page/trigger_publish_service_spec.rb'
-    - 'ee/spec/services/status_page/unpublish_details_service_spec.rb'
-    - 'ee/spec/services/vulnerabilities/create_from_security_finding_service_spec.rb'
-    - 'ee/spec/services/vulnerabilities/findings/create_from_security_finding_service_spec.rb'
-    - 'ee/spec/support/shared_examples/services/audit_event_logging_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/status_page/publish_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/status_page/reference_links_examples.rb'
-    - 'ee/spec/workers/scan_security_report_secrets_worker_spec.rb'
     - 'lib/gitlab/no_cache_headers.rb'
     - 'lib/gitlab/sidekiq_daemon/memory_killer.rb'
     - 'lib/gitlab/sidekiq_middleware/server_metrics.rb'

ee/spec/services/arkose/blocked_users_report_service_spec.rb

@@ -60,8 +60,9 @@
       let(:blocked_at) { DateTime.now - 1.day }
       let!(:user_custom_attributes) do
         blocked_user_without_arkose_session.custom_attributes.create! key: 'blocked_at',
-                                       value: blocked_at, created_at: DateTime.now - 1.day,
-                                       updated_at: DateTime.now - 1.day
+                                                                      value: blocked_at,
+                                                                      created_at: DateTime.now - 1.day,
+                                                                      updated_at: DateTime.now - 1.day
       end
 
       it 'does not sends the list of blocked users to Arkose' do

ee/spec/services/audit_events/protected_branch_audit_event_service_spec.rb

@@ -31,7 +31,7 @@
 
           expect(security_event.details).to include(
             author_name: author.name,
-            target_id:  protected_branch.id,
+            target_id: protected_branch.id,
             entity_path: entity.full_path,
             target_type: 'ProtectedBranch',
             target_details: protected_branch.name,
@@ -56,19 +56,19 @@
           expect(logger).to have_received(:info).with(hash_including(
                                                         'author_id' => author.id,
                                                         'author_name' => author.name,
-                                                        'entity_id' =>  entity.id,
-                                                        'entity_type' =>  'Project',
-                                                        'entity_path' =>  entity.full_path,
-                                                        'allow_force_push' =>  true,
-                                                        'code_owner_approval_required' =>  true,
-                                                        'merge_access_levels' =>  [merge_level],
-                                                        'push_access_levels' =>  [push_level],
-                                                        'target_details' =>  protected_branch.name,
-                                                        'target_id' =>  protected_branch.id,
-                                                        'target_type' =>  'ProtectedBranch',
-                                                        'custom_message' =>  action == :add ? /Added/ : /Unprotected/,
-                                                        'ip_address' =>  ip_address,
-                                                        'created_at' =>  anything)
+                                                        'entity_id' => entity.id,
+                                                        'entity_type' => 'Project',
+                                                        'entity_path' => entity.full_path,
+                                                        'allow_force_push' => true,
+                                                        'code_owner_approval_required' => true,
+                                                        'merge_access_levels' => [merge_level],
+                                                        'push_access_levels' => [push_level],
+                                                        'target_details' => protected_branch.name,
+                                                        'target_id' => protected_branch.id,
+                                                        'target_type' => 'ProtectedBranch',
+                                                        'custom_message' => action == :add ? /Added/ : /Unprotected/,
+                                                        'ip_address' => ip_address,
+                                                        'created_at' => anything)
                                                      )
         end
 

ee/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb

@@ -7,9 +7,12 @@
   let_it_be(:project) { create(:project, :repository) }
 
   let(:mr_merge_if_green_enabled) do
-    create(:merge_request, merge_when_pipeline_succeeds: true, merge_user: user,
-           source_branch: "master", target_branch: 'feature',
-           source_project: project, target_project: project, state: "opened")
+    create(:merge_request,
+      merge_when_pipeline_succeeds: true,
+      merge_user: user,
+      source_branch: "master", target_branch: 'feature',
+      source_project: project, target_project: project,
+      state: "opened")
   end
 
   let(:pipeline) do
@@ -34,9 +37,10 @@
     let(:pipeline_status) { :running }
 
     before do
-      create(:ci_pipeline, pipeline_status, ref: mr_merge_if_green_enabled.source_branch,
-             sha: mr_merge_if_green_enabled.diff_head_sha,
-             project: mr_merge_if_green_enabled.source_project)
+      create(:ci_pipeline, pipeline_status,
+        ref: mr_merge_if_green_enabled.source_branch,
+        sha: mr_merge_if_green_enabled.diff_head_sha,
+        project: mr_merge_if_green_enabled.source_project)
       mr_merge_if_green_enabled.update_head_pipeline
     end
 

ee/spec/services/ci/create_pipeline_service/cross_needs_artifacts_spec.rb

@@ -71,7 +71,8 @@
     let(:other_project) { create(:project, :repository) }
 
     let(:other_pipeline) do
-      create(:ci_pipeline, project: other_project,
+      create(:ci_pipeline,
+        project: other_project,
         sha: other_project.commit.id,
         ref: other_project.default_branch,
         status: 'success',

ee/spec/services/ci/process_pipeline_service_spec.rb

@@ -21,9 +21,8 @@
   describe 'cross-project pipelines' do
     before do
       create_processable(:build, name: 'test', stage: 'test')
-      create_processable(:bridge, :variables,  name: 'cross',
-                                              stage: 'build',
-                                              downstream: downstream)
+      create_processable(:bridge, :variables,
+        name: 'cross', stage: 'build', downstream: downstream)
       create_processable(:build, name: 'deploy', stage: 'deploy')
 
       stub_ci_pipeline_to_return_yaml_file

ee/spec/services/ci/retry_pipeline_service_spec.rb

@@ -20,8 +20,7 @@
     let_it_be(:namespace) { create(:namespace, :with_used_build_minutes_limit) }
     let_it_be(:project) { create(:project, namespace: namespace) }
     let_it_be(:private_runner) do
-      create(:ci_runner, :project, :online, projects: [project],
-        tag_list: ['ruby'], run_untagged: false)
+      create(:ci_runner, :project, :online, projects: [project], tag_list: ['ruby'], run_untagged: false)
     end
 
     before do

ee/spec/services/ci/subscribe_bridge_service_spec.rb

@@ -17,11 +17,10 @@
 
       context 'when the upstream project has a pipeline' do
         let!(:upstream_pipeline) do
-          create(
-            :ci_pipeline, project: upstream_project,
+          create(:ci_pipeline,
+            project: upstream_project,
             ref: upstream_project.default_branch,
-            sha: upstream_project.commit.sha
-          )
+            sha: upstream_project.commit.sha)
         end
 
         context 'when the user has permissions' do

ee/spec/services/ee/merge_requests/create_pipeline_service_spec.rb

@@ -107,8 +107,11 @@
 
     context 'when merge request requires an approval' do
       before do
-        create(:approval_merge_request_rule, merge_request: merge_request, users: [user], name: 'some-custom-rule',
-               approvals_required: 1)
+        create(:approval_merge_request_rule,
+          merge_request: merge_request,
+          users: [user],
+          name: 'some-custom-rule',
+          approvals_required: 1)
       end
 
       it_behaves_like 'merged result pipeline'

ee/spec/services/merge_trains/check_status_service_spec.rb

@@ -23,14 +23,16 @@
 
     context 'when there is at least one merge request on the train' do
       let!(:merged_merge_request) do
-        create(:merge_request, :on_train, train_creator: maintainer,
+        create(:merge_request, :on_train,
+          train_creator: maintainer,
           source_branch: 'feature', source_project: project,
           target_branch: 'master', target_project: project,
           merge_status: 'unchecked', status: MergeTrain.state_machines[:status].states[:merged].value)
       end
 
       let!(:active_merge_request) do
-        create(:merge_request, :on_train, train_creator: maintainer,
+        create(:merge_request, :on_train,
+          train_creator: maintainer,
           source_branch: 'improve/awesome', source_project: project,
           target_branch: 'master', target_project: project,
           merge_status: 'unchecked')

ee/spec/services/merge_trains/create_pipeline_service_spec.rb

@@ -20,7 +20,8 @@
     subject { service.execute(merge_request, previous_ref) }
 
     let!(:merge_request) do
-      create(:merge_request, :on_train, train_creator: maintainer,
+      create(:merge_request, :on_train,
+        train_creator: maintainer,
         source_branch: 'feature', source_project: project,
         target_branch: 'master', target_project: project,
         merge_status: 'unchecked')

ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb

@@ -20,7 +20,8 @@
     subject { service.execute(merge_request) }
 
     let!(:merge_request) do
-      create(:merge_request, :on_train, train_creator: maintainer,
+      create(:merge_request, :on_train,
+        train_creator: maintainer,
         source_branch: 'feature', source_project: project,
         target_branch: 'master', target_project: project)
     end

ee/spec/services/merge_trains/refresh_service_spec.rb

@@ -20,13 +20,15 @@
     subject { service.execute(merge_request.target_project_id, merge_request.target_branch) }
 
     let!(:merge_request_1) do
-      create(:merge_request, :on_train, train_creator: maintainer_1,
+      create(:merge_request, :on_train,
+        train_creator: maintainer_1,
         source_branch: 'feature', source_project: project,
         target_branch: 'master', target_project: project)
     end
 
     let!(:merge_request_2) do
-      create(:merge_request, :on_train, train_creator: maintainer_2,
+      create(:merge_request, :on_train,
+        train_creator: maintainer_2,
         source_branch: 'signed-commits', source_project: project,
         target_branch: 'master', target_project: project)
     end

ee/spec/services/status_page/trigger_publish_service_spec.rb

@@ -106,8 +106,7 @@
       let(:emoji_name) { Gitlab::StatusPage::AWARD_EMOJI }
 
       before do
-        create(:award_emoji, user: user, name: emoji_name,
-               awardable: triggered_by)
+        create(:award_emoji, user: user, name: emoji_name, awardable: triggered_by)
       end
 
       context 'for issues' do

ee/spec/services/status_page/unpublish_details_service_spec.rb

@@ -19,8 +19,7 @@
     let(:storage_client) { instance_double(Gitlab::StatusPage::Storage::S3Client) }
 
     let(:status_page_setting) do
-      instance_double(StatusPage::ProjectSetting, enabled?: status_page_setting_enabled,
-                      storage_client: storage_client)
+      instance_double(StatusPage::ProjectSetting, enabled?: status_page_setting_enabled, storage_client: storage_client)
     end
 
     before do

ee/spec/services/vulnerabilities/create_from_security_finding_service_spec.rb

@@ -46,8 +46,8 @@
   context 'when there is an existing vulnerability for the security finding' do
     let_it_be(:security_finding) { create(:security_finding) }
     let_it_be(:vulnerability) do
-      create(:vulnerability, project: project,
-             findings: [create(:vulnerabilities_finding, uuid: security_finding_uuid)])
+      create(:vulnerability,
+        project: project, findings: [create(:vulnerabilities_finding, uuid: security_finding_uuid)])
     end
 
     it 'does not creates a new Vulnerability' do

ee/spec/services/vulnerabilities/findings/create_from_security_finding_service_spec.rb

@@ -68,13 +68,12 @@
 
   context 'when there is an existing vulnerability and vulnerability finding for the security finding' do
     let_it_be(:finding) do
-      create(:vulnerabilities_finding, :detected, report_type: :sast, project: project,
-             uuid: sast_security_findings.first.uuid)
+      create(:vulnerabilities_finding, :detected,
+        report_type: :sast, project: project, uuid: sast_security_findings.first.uuid)
     end
 
     let_it_be(:vulnerability) do
-      create(:vulnerability, report_type: :sast, project: project,
-             findings: [finding])
+      create(:vulnerability, report_type: :sast, project: project, findings: [finding])
     end
 
     it 'returns the existing Vulnerability::Finding with the existing vulnerability id' do

ee/spec/support/shared_examples/services/audit_event_logging_shared_examples.rb

@@ -63,9 +63,9 @@
       security_event = AuditEvent.last
 
       expect(security_event.details).to eq(author_name: user.name,
-                                          custom_message: custom_message,
-                                          ip_address: ip_address,
-                                          action: :custom)
+                                           custom_message: custom_message,
+                                           ip_address: ip_address,
+                                           action: :custom)
       expect(security_event.author_id).to eq(user.id)
       expect(security_event.entity_id).to eq(entity.id)
       expect(security_event.entity_type).to eq(entity_type)

ee/spec/support/shared_examples/status_page/publish_shared_examples.rb

@@ -7,8 +7,7 @@
   let(:content_json) { content.to_json }
 
   let(:status_page_setting) do
-    instance_double(StatusPage::ProjectSetting, enabled?: status_page_setting_enabled,
-                    storage_client: storage_client)
+    instance_double(StatusPage::ProjectSetting, enabled?: status_page_setting_enabled, storage_client: storage_client)
   end
 
   before do

ee/spec/support/shared_examples/status_page/reference_links_examples.rb

@@ -99,8 +99,7 @@
 
     context 'with @all' do
       let(:reference) do
-        double(:reference, name: 'All Project and Group Members',
-               to_reference: '@all')
+        double(:reference, name: 'All Project and Group Members', to_reference: '@all')
       end
 
       include_examples 'mention anonymization'