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

Fix Layout/HashAlignment offenses 33

See merge request !95880

.rubocop_todo/layout/hash_alignment.yml

@@ -198,32 +198,6 @@ Layout/HashAlignment:
     - 'spec/models/user_spec.rb'
     - 'spec/presenters/clusters/cluster_presenter_spec.rb'
     - 'spec/presenters/project_presenter_spec.rb'
-    - 'spec/requests/api/ci/job_artifacts_spec.rb'
-    - 'spec/requests/api/ci/jobs_spec.rb'
-    - 'spec/requests/api/ci/runner/jobs_request_post_spec.rb'
-    - 'spec/requests/api/feature_flags_spec.rb'
-    - 'spec/requests/api/graphql/ci/config_spec.rb'
-    - 'spec/requests/api/graphql/ci/group_variables_spec.rb'
-    - 'spec/requests/api/graphql/ci/instance_variables_spec.rb'
-    - 'spec/requests/api/graphql/ci/project_variables_spec.rb'
-    - 'spec/requests/api/graphql/ci/runner_spec.rb'
-    - 'spec/requests/api/graphql/ci/runners_spec.rb'
-    - 'spec/requests/api/graphql/mutations/releases/update_spec.rb'
-    - 'spec/requests/api/graphql/project/issue/design_collection/version_spec.rb'
-    - 'spec/requests/api/graphql/project/terraform/state_spec.rb'
-    - 'spec/requests/api/graphql/project/terraform/states_spec.rb'
-    - 'spec/requests/api/graphql/query_spec.rb'
-    - 'spec/requests/api/groups_spec.rb'
-    - 'spec/requests/api/internal/base_spec.rb'
-    - 'spec/requests/api/issues/get_group_issues_spec.rb'
-    - 'spec/requests/api/projects_spec.rb'
-    - 'spec/requests/api/suggestions_spec.rb'
-    - 'spec/requests/api/unleash_spec.rb'
-    - 'spec/requests/git_http_spec.rb'
-    - 'spec/requests/oauth_tokens_spec.rb'
-    - 'spec/requests/openid_connect_spec.rb'
-    - 'spec/requests/projects/environments_controller_spec.rb'
-    - 'spec/requests/projects/merge_requests_discussions_spec.rb'
     - 'spec/routing/project_routing_spec.rb'
     - 'spec/serializers/ci/lint/job_entity_spec.rb'
     - 'spec/serializers/container_repository_entity_spec.rb'

spec/requests/api/ci/job_artifacts_spec.rb

@@ -24,8 +24,7 @@
   let(:guest) { create(:project_member, :guest, project: project).user }
 
   let!(:job) do
-    create(:ci_build, :success, :tags, pipeline: pipeline,
-                                artifacts_expire_at: 1.day.since)
+    create(:ci_build, :success, :tags, pipeline: pipeline, artifacts_expire_at: 1.day.since)
   end
 
   before do
@@ -535,8 +534,7 @@ def get_for_ref(ref = pipeline.ref, job_name = job.name)
       context 'with regular branch' do
         before do
           pipeline.reload
-          pipeline.update!(ref: 'master',
-                          sha: project.commit('master').sha)
+          pipeline.update!(ref: 'master', sha: project.commit('master').sha)
 
           get_for_ref('master')
         end
@@ -579,8 +577,7 @@ def get_for_ref(ref = pipeline.ref, job_name = job.name)
         stub_artifacts_object_storage
         job.success
 
-        project.update!(visibility_level: visibility_level,
-                       public_builds: public_builds)
+        project.update!(visibility_level: visibility_level, public_builds: public_builds)
 
         get_artifact_file(artifact)
       end
@@ -676,8 +673,7 @@ def get_for_ref(ref = pipeline.ref, job_name = job.name)
       context 'with branch name containing slash' do
         before do
           pipeline.reload
-          pipeline.update!(ref: 'improve/awesome',
-                          sha: project.commit('improve/awesome').sha)
+          pipeline.update!(ref: 'improve/awesome', sha: project.commit('improve/awesome').sha)
         end
 
         it 'returns a specific artifact file for a valid path', :sidekiq_might_not_need_inline do

spec/requests/api/ci/jobs_spec.rb

@@ -32,8 +32,7 @@
   end
 
   let!(:job) do
-    create(:ci_build, :success, :tags, pipeline: pipeline,
-                                artifacts_expire_at: 1.day.since)
+    create(:ci_build, :success, :tags, pipeline: pipeline, artifacts_expire_at: 1.day.since)
   end
 
   before do

spec/requests/api/ci/runner/jobs_request_post_spec.rb

@@ -546,9 +546,12 @@
             let!(:job) { create(:ci_build, :pending, :queued, :tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
             let!(:job2) { create(:ci_build, :pending, :queued, :tag, pipeline: pipeline, name: 'rubocop', stage: 'test', stage_idx: 0) }
             let!(:test_job) do
-              create(:ci_build, :pending, :queued, pipeline: pipeline, name: 'deploy',
-                                stage: 'deploy', stage_idx: 1,
-                                options: { script: ['bash'], dependencies: [job2.name] })
+              create(:ci_build, :pending, :queued,
+                pipeline: pipeline,
+                name: 'deploy',
+                stage: 'deploy',
+                stage_idx: 1,
+                options: { script: ['bash'], dependencies: [job2.name] })
             end
 
             before do
@@ -570,9 +573,12 @@
             let!(:job) { create(:ci_build, :pending, :queued, :tag, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) }
             let!(:job2) { create(:ci_build, :pending, :queued, :tag, pipeline: pipeline, name: 'rubocop', stage: 'test', stage_idx: 0) }
             let!(:empty_dependencies_job) do
-              create(:ci_build, :pending, :queued, pipeline: pipeline, name: 'empty_dependencies_job',
-                                stage: 'deploy', stage_idx: 1,
-                                options: { script: ['bash'], dependencies: [] })
+              create(:ci_build, :pending, :queued,
+                pipeline: pipeline,
+                name: 'empty_dependencies_job',
+                stage: 'deploy',
+                stage_idx: 1,
+                options: { script: ['bash'], dependencies: [] })
             end
 
             before do
@@ -889,9 +895,12 @@
         describe 'a job with excluded artifacts' do
           context 'when excluded paths are defined' do
             let(:job) do
-              create(:ci_build, :pending, :queued, pipeline: pipeline, name: 'test',
-                                stage: 'deploy', stage_idx: 1,
-                                options: { artifacts: { paths: ['abc'], exclude: ['cde'] } })
+              create(:ci_build, :pending, :queued,
+                pipeline: pipeline,
+                name: 'test',
+                stage: 'deploy',
+                stage_idx: 1,
+                options: { artifacts: { paths: ['abc'], exclude: ['cde'] } })
             end
 
             context 'when a runner supports this feature' do

spec/requests/api/feature_flags_spec.rb

@@ -365,8 +365,8 @@
   describe 'PUT /projects/:id/feature_flags/:name' do
     context 'with a version 2 feature flag' do
       let!(:feature_flag) do
-        create(:operations_feature_flag, :new_version_flag, project: project, active: true,
-               name: 'feature1', description: 'old description')
+        create(:operations_feature_flag, :new_version_flag,
+          project: project, active: true, name: 'feature1', description: 'old description')
       end
 
       it 'returns a 404 if the feature flag does not exist' do
@@ -591,8 +591,8 @@
 
       it 'deletes a feature flag strategy' do
         strategy_a = create(:operations_strategy, feature_flag: feature_flag, name: 'default', parameters: {})
-        strategy_b = create(:operations_strategy, feature_flag: feature_flag,
-                          name: 'userWithId', parameters: { userIds: 'userA,userB' })
+        strategy_b = create(:operations_strategy,
+          feature_flag: feature_flag, name: 'userWithId', parameters: { userIds: 'userA,userB' })
         params = {
           strategies: [{
             id: strategy_a.id,

spec/requests/api/graphql/ci/config_spec.rb

@@ -173,7 +173,7 @@
                 {
                   "name" => "docker",
                   "size" => 1,
-                    "jobs" =>
+                  "jobs" =>
                     {
                       "nodes" => [
                       {
@@ -206,7 +206,7 @@
                 {
                   "name" => "deploy_job",
                   "size" => 1,
-                    "jobs" =>
+                  "jobs" =>
                     {
                       "nodes" => [
                       {
@@ -332,7 +332,7 @@
                           "only" => { "refs" => %w[branches tags] },
                           "when" => "on_success",
                           "tags" => [],
-                           "needs" => { "nodes" => [] } }
+                          "needs" => { "nodes" => [] } }
                       ]
                     }
                   }

spec/requests/api/graphql/ci/group_variables_spec.rb

@@ -35,8 +35,14 @@
     end
 
     it "returns the group's CI variables" do
-      variable = create(:ci_group_variable, group: group, key: 'TEST_VAR', value: 'test',
-                        masked: false, protected: true, raw: true, environment_scope: 'staging')
+      variable = create(:ci_group_variable,
+        group: group,
+        key: 'TEST_VAR',
+        value: 'test',
+        masked: false,
+        protected: true,
+        raw: true,
+        environment_scope: 'staging')
 
       post_graphql(query, current_user: user)
 

spec/requests/api/graphql/ci/instance_variables_spec.rb

@@ -29,7 +29,7 @@
 
     it "returns the instance's CI variables" do
       variable = create(:ci_instance_variable, key: 'TEST_VAR', value: 'test',
-                        masked: false, protected: true, raw: true)
+                                               masked: false, protected: true, raw: true)
 
       post_graphql(query, current_user: user)
 

spec/requests/api/graphql/ci/project_variables_spec.rb

@@ -36,7 +36,7 @@
 
     it "returns the project's CI variables" do
       variable = create(:ci_variable, project: project, key: 'TEST_VAR', value: 'test',
-                        masked: false, protected: true, raw: true, environment_scope: 'production')
+                                      masked: false, protected: true, raw: true, environment_scope: 'production')
 
       post_graphql(query, current_user: user)
 

spec/requests/api/graphql/ci/runner_spec.rb

@@ -9,21 +9,49 @@
   let_it_be(:group) { create(:group) }
 
   let_it_be(:active_instance_runner) do
-    create(:ci_runner, :instance, description: 'Runner 1', contacted_at: 2.hours.ago,
-           active: true, version: 'adfe156', revision: 'a', locked: true, ip_address: '127.0.0.1', maximum_timeout: 600,
-           access_level: 0, tag_list: %w[tag1 tag2], run_untagged: true, executor_type: :custom,
-           maintenance_note: '**Test maintenance note**')
+    create(:ci_runner, :instance,
+      description: 'Runner 1',
+      contacted_at: 2.hours.ago,
+      active: true,
+      version: 'adfe156',
+      revision: 'a',
+      locked: true,
+      ip_address: '127.0.0.1',
+      maximum_timeout: 600,
+      access_level: 0,
+      tag_list: %w[tag1 tag2],
+      run_untagged: true,
+      executor_type: :custom,
+      maintenance_note: '**Test maintenance note**')
   end
 
   let_it_be(:inactive_instance_runner) do
-    create(:ci_runner, :instance, description: 'Runner 2', contacted_at: 1.day.ago, active: false,
-           version: 'adfe157', revision: 'b', ip_address: '10.10.10.10', access_level: 1, run_untagged: true)
+    create(:ci_runner, :instance,
+      description: 'Runner 2',
+      contacted_at: 1.day.ago,
+      active: false,
+      version: 'adfe157',
+      revision: 'b',
+      ip_address: '10.10.10.10',
+      access_level: 1,
+      run_untagged: true)
   end
 
   let_it_be(:active_group_runner) do
-    create(:ci_runner, :group, groups: [group], description: 'Group runner 1', contacted_at: 2.hours.ago,
-           active: true, version: 'adfe156', revision: 'a', locked: true, ip_address: '127.0.0.1', maximum_timeout: 600,
-           access_level: 0, tag_list: %w[tag1 tag2], run_untagged: true, executor_type: :shell)
+    create(:ci_runner, :group,
+      groups: [group],
+      description: 'Group runner 1',
+      contacted_at: 2.hours.ago,
+      active: true,
+      version: 'adfe156',
+      revision: 'a',
+      locked: true,
+      ip_address: '127.0.0.1',
+      maximum_timeout: 600,
+      access_level: 0,
+      tag_list: %w[tag1 tag2],
+      run_untagged: true,
+      executor_type: :shell)
   end
 
   let_it_be(:active_project_runner) { create(:ci_runner, :project) }
@@ -159,8 +187,16 @@
 
       with_them do
         let(:project_runner) do
-          create(:ci_runner, :project, description: 'Runner 3', contacted_at: 1.day.ago, active: false, locked: is_locked,
-                 version: 'adfe157', revision: 'b', ip_address: '10.10.10.10', access_level: 1, run_untagged: true)
+          create(:ci_runner, :project,
+            description: 'Runner 3',
+            contacted_at: 1.day.ago,
+            active: false,
+            locked: is_locked,
+            version: 'adfe157',
+            revision: 'b',
+            ip_address: '10.10.10.10',
+            access_level: 1,
+            run_untagged: true)
         end
 
         let(:query) do

spec/requests/api/graphql/ci/runners_spec.rb

@@ -141,8 +141,13 @@ def pagination_results_data(runners)
 
   describe 'edges' do
     let_it_be(:runner) do
-      create(:ci_runner, :group, active: false, version: 'def', revision: '456',
-             description: 'Project runner', groups: [group], ip_address: '127.0.0.1')
+      create(:ci_runner, :group,
+        active: false,
+        version: 'def',
+        revision: '456',
+        description: 'Project runner',
+        groups: [group],
+        ip_address: '127.0.0.1')
     end
 
     let(:query) do

spec/requests/api/graphql/mutations/releases/update_spec.rb

@@ -22,9 +22,14 @@
   let_it_be(:milestones) { [milestone_12_3, milestone_12_4] }
 
   let_it_be(:release) do
-    create(:release, project: project, tag: tag_name, name: name,
-           description: description, released_at: Time.parse(released_at).utc,
-           created_at: Time.parse(created_at).utc, milestones: milestones)
+    create(:release,
+      project: project,
+      tag: tag_name,
+      name: name,
+      description: description,
+      released_at: Time.parse(released_at).utc,
+      created_at: Time.parse(created_at).utc,
+      milestones: milestones)
   end
 
   let(:mutation_name) { :release_update }

spec/requests/api/graphql/project/issue/design_collection/version_spec.rb

@@ -11,14 +11,14 @@
   let_it_be(:developer) { create(:user) }
   let_it_be(:stranger) { create(:user) }
   let_it_be(:old_version) do
-    create(:design_version, issue: issue,
-           created_designs: create_list(:design, 3, issue: issue))
+    create(:design_version, issue: issue, created_designs: create_list(:design, 3, issue: issue))
   end
 
   let_it_be(:version) do
-    create(:design_version, issue: issue,
-           modified_designs: old_version.designs,
-           created_designs: create_list(:design, 2, issue: issue))
+    create(:design_version,
+      issue: issue,
+      modified_designs: old_version.designs,
+      created_designs: create_list(:design, 2, issue: issue))
   end
 
   let(:current_user) { developer }

spec/requests/api/graphql/project/terraform/state_spec.rb

@@ -60,17 +60,17 @@
     expect(data).to match a_graphql_entity_for(
       terraform_state,
       :name,
-      'lockedAt'      => terraform_state.locked_at.iso8601,
-      'createdAt'     => terraform_state.created_at.iso8601,
-      'updatedAt'     => terraform_state.updated_at.iso8601,
-      'lockedByUser'  => a_graphql_entity_for(terraform_state.locked_by_user),
+      'lockedAt' => terraform_state.locked_at.iso8601,
+      'createdAt' => terraform_state.created_at.iso8601,
+      'updatedAt' => terraform_state.updated_at.iso8601,
+      'lockedByUser' => a_graphql_entity_for(terraform_state.locked_by_user),
       'latestVersion' => a_graphql_entity_for(
         latest_version,
-        'serial'        => eq(latest_version.version),
-        'createdAt'     => eq(latest_version.created_at.iso8601),
-        'updatedAt'     => eq(latest_version.updated_at.iso8601),
+        'serial' => eq(latest_version.version),
+        'createdAt' => eq(latest_version.created_at.iso8601),
+        'updatedAt' => eq(latest_version.updated_at.iso8601),
         'createdByUser' => a_graphql_entity_for(latest_version.created_by_user),
-        'job'           => { 'name' => eq(latest_version.build.name) }
+        'job' => { 'name' => eq(latest_version.build.name) }
       )
     )
   end

spec/requests/api/graphql/project/terraform/states_spec.rb

@@ -64,18 +64,18 @@
 
     expect(data['nodes']).to contain_exactly a_graphql_entity_for(
       terraform_state, :name,
-      'lockedAt'      => terraform_state.locked_at.iso8601,
-      'createdAt'     => terraform_state.created_at.iso8601,
-      'updatedAt'     => terraform_state.updated_at.iso8601,
-      'lockedByUser'  => a_graphql_entity_for(terraform_state.locked_by_user),
+      'lockedAt' => terraform_state.locked_at.iso8601,
+      'createdAt' => terraform_state.created_at.iso8601,
+      'updatedAt' => terraform_state.updated_at.iso8601,
+      'lockedByUser' => a_graphql_entity_for(terraform_state.locked_by_user),
       'latestVersion' => a_graphql_entity_for(
         latest_version,
-        'serial'        => eq(latest_version.version),
-        'downloadPath'  => eq(download_path),
-        'createdAt'     => eq(latest_version.created_at.iso8601),
-        'updatedAt'     => eq(latest_version.updated_at.iso8601),
+        'serial' => eq(latest_version.version),
+        'downloadPath' => eq(download_path),
+        'createdAt' => eq(latest_version.created_at.iso8601),
+        'updatedAt' => eq(latest_version.updated_at.iso8601),
         'createdByUser' => a_graphql_entity_for(latest_version.created_by_user),
-        'job'           => { 'name' => eq(latest_version.build.name) }
+        'job' => { 'name' => eq(latest_version.build.name) }
       )
     )
   end

spec/requests/api/graphql/query_spec.rb

@@ -108,8 +108,8 @@
             design_at_version,
             'filename' => design_at_version.design.filename,
             'version' => a_graphql_entity_for(version, :sha),
-            'design'  => a_graphql_entity_for(design),
-            'issue'   => { 'title' => issue.title, 'iid' => issue.iid.to_s },
+            'design' => a_graphql_entity_for(design),
+            'issue' => { 'title' => issue.title, 'iid' => issue.iid.to_s },
             'project' => a_graphql_entity_for(project, :full_path)
           )
         end

spec/requests/api/groups_spec.rb

@@ -540,9 +540,9 @@ def groups_visible_to_user(user)
     # Returns a Hash of visibility_level => Project pairs
     def add_projects_to_group(group, share_with: nil)
       projects = {
-        public:   create(:project, :public,   namespace: group),
+        public: create(:project, :public, namespace: group),
         internal: create(:project, :internal, namespace: group),
-        private:  create(:project, :private,  namespace: group)
+        private: create(:project, :private,  namespace: group)
       }
 
       if share_with

spec/requests/api/internal/base_spec.rb

@@ -188,7 +188,7 @@ def perform_request(headers: gitlab_shell_internal_api_request_header)
     it 'returns an error message when expires_at contains an invalid date' do
       post api('/internal/personal_access_token'),
            params: {
-             key_id:  key.id,
+             key_id: key.id,
              name: 'newtoken',
              scopes: ['api'],
              expires_at: 'invalid-date'
@@ -202,7 +202,7 @@ def perform_request(headers: gitlab_shell_internal_api_request_header)
     it 'returns an error message when it receives an invalid scope' do
       post api('/internal/personal_access_token'),
            params: {
-             key_id:  key.id,
+             key_id: key.id,
              name: 'newtoken',
              scopes: %w(read_api badscope read_repository)
            },
@@ -217,7 +217,7 @@ def perform_request(headers: gitlab_shell_internal_api_request_header)
 
       post api('/internal/personal_access_token'),
            params: {
-             key_id:  key.id,
+             key_id: key.id,
              name: 'newtoken',
              scopes: %w(read_api read_repository)
            },
@@ -234,7 +234,7 @@ def perform_request(headers: gitlab_shell_internal_api_request_header)
 
       post api('/internal/personal_access_token'),
            params: {
-             key_id:  key.id,
+             key_id: key.id,
              name: 'newtoken',
              scopes: %w(read_api read_repository),
              expires_at: '9001-11-17'

spec/requests/api/issues/get_group_issues_spec.rb

@@ -465,10 +465,10 @@
 
       context 'with archived projects' do
         let_it_be(:archived_issue) do
-          create(
-            :issue, author: user, assignees: [user],
-            project: create(:project, :public, :archived, creator_id: user.id, namespace: group)
-          )
+          create(:issue,
+            author: user,
+            assignees: [user],
+            project: create(:project, :public, :archived, creator_id: user.id, namespace: group))
         end
 
         it 'returns only non archived projects issues' do

spec/requests/api/projects_spec.rb

@@ -1249,9 +1249,10 @@
       stub_application_setting(import_sources: nil)
 
       endpoint_url = "#{url}/info/refs?service=git-upload-pack"
-      stub_full_request(endpoint_url, method: :get).to_return({ status: 200,
-        body: '001e# service=git-upload-pack',
-        headers: { 'Content-Type': 'application/x-git-upload-pack-advertisement' } })
+      stub_full_request(endpoint_url, method: :get).to_return(
+        { status: 200,
+          body: '001e# service=git-upload-pack',
+          headers: { 'Content-Type': 'application/x-git-upload-pack-advertisement' } })
 
       project_params = { import_url: url, path: 'path-project-Foo', name: 'Foo Project' }
       expect { post api('/projects', user), params: project_params }