Fix Layout/ArgumentAlignment offenses in spec/features

Fix Layout/ArgumentAlignment offenses in spec/features

.rubocop_todo/layout/argument_alignment.yml

@@ -1613,20 +1613,6 @@ Layout/ArgumentAlignment:
     - 'spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb'
     - 'spec/features/merge_request/user_opens_checkout_branch_modal_spec.rb'
     - 'spec/features/merge_request/user_posts_notes_spec.rb'
-    - 'spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb'
-    - 'spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rb'
-    - 'spec/features/merge_request/user_resolves_wip_mr_spec.rb'
-    - 'spec/features/merge_request/user_sees_deployment_widget_spec.rb'
-    - 'spec/features/merge_request/user_sees_discussions_navigation_spec.rb'
-    - 'spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb'
-    - 'spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb'
-    - 'spec/features/merge_request/user_sees_merge_widget_spec.rb'
-    - 'spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb'
-    - 'spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb'
-    - 'spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb'
-    - 'spec/features/merge_request/user_sees_pipelines_from_forked_project_spec.rb'
-    - 'spec/features/merge_request/user_sees_pipelines_spec.rb'
-    - 'spec/features/merge_request/user_sees_versions_spec.rb'
     - 'spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb'
     - 'spec/features/merge_request/user_squashes_merge_request_spec.rb'
     - 'spec/features/merge_request/user_suggests_changes_on_diff_spec.rb'

spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb

@@ -10,9 +10,7 @@
   let!(:note)         { create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "| Markdown | Table |\n|-------|---------|\n| first | second |") }
   let(:path)          { "files/ruby/popen.rb" }
   let(:position) do
-    build(:text_diff_position,
-          file: path, old_line: nil, new_line: 9,
-          diff_refs: merge_request.diff_refs)
+    build(:text_diff_position, file: path, old_line: nil, new_line: 9, diff_refs: merge_request.diff_refs)
   end
 
   before do

spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'Merge request > User resolves outdated diff discussions',
-               :js, feature_category: :code_review_workflow do
+  :js, feature_category: :code_review_workflow do
   let(:project) { create(:project, :repository, :public) }
 
   let(:merge_request) do
@@ -30,17 +30,21 @@
   end
 
   let!(:outdated_discussion) do
-    create(:diff_note_on_merge_request,
-           project: project,
-           noteable: merge_request,
-           position: outdated_position).to_discussion
+    create(
+      :diff_note_on_merge_request,
+      project: project,
+      noteable: merge_request,
+      position: outdated_position
+    ).to_discussion
   end
 
   let!(:current_discussion) do
-    create(:diff_note_on_merge_request,
-           noteable: merge_request,
-           project: project,
-           position: current_position).to_discussion
+    create(
+      :diff_note_on_merge_request,
+      noteable: merge_request,
+      project: project,
+      position: current_position
+    ).to_discussion
   end
 
   before do

spec/features/merge_request/user_resolves_wip_mr_spec.rb

@@ -6,17 +6,23 @@
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) do
-    create(:merge_request_with_diffs, source_project: project,
-                                      author: user,
-                                      title: 'Draft: Bug NS-04',
-                                      merge_params: { force_remove_source_branch: '1' })
+    create(
+      :merge_request_with_diffs,
+      source_project: project,
+      author: user,
+      title: 'Draft: Bug NS-04',
+      merge_params: { force_remove_source_branch: '1' }
+    )
   end
 
   let(:pipeline) do
-    create(:ci_pipeline, project: project,
-                         sha: merge_request.diff_head_sha,
-                         ref: merge_request.source_branch,
-                         head_pipeline_of: merge_request)
+    create(
+      :ci_pipeline,
+      project: project,
+      sha: merge_request.diff_head_sha,
+      ref: merge_request.source_branch,
+      head_pipeline_of: merge_request
+    )
   end
 
   before do

spec/features/merge_request/user_sees_deployment_widget_spec.rb

@@ -115,8 +115,7 @@ def assert_env_widget(text, env_name)
 
     context 'with stop action' do
       let(:manual) do
-        create(:ci_build, :manual, pipeline: pipeline,
-                                   name: 'close_app', environment: environment.name)
+        create(:ci_build, :manual, pipeline: pipeline, name: 'close_app', environment: environment.name)
       end
 
       before do
@@ -146,8 +145,7 @@ def assert_env_widget(text, env_name)
 
     context 'with stop action with the review_apps_redeploy_mr_widget feature flag turned on' do
       let(:manual) do
-        create(:ci_build, :manual, pipeline: pipeline,
-               name: 'close_app', environment: environment.name)
+        create(:ci_build, :manual, pipeline: pipeline, name: 'close_app', environment: environment.name)
       end
 
       before do

spec/features/merge_request/user_sees_discussions_navigation_spec.rb

@@ -13,27 +13,30 @@
 
   describe 'Code discussions' do
     let!(:position) do
-      build(:text_diff_position, :added,
-            file: "files/images/wm.svg",
-            new_line: 1,
-            diff_refs: merge_request.diff_refs
+      build(
+        :text_diff_position, :added,
+        file: "files/images/wm.svg",
+        new_line: 1,
+        diff_refs: merge_request.diff_refs
       )
     end
 
     let!(:first_discussion) do
-      create(:diff_note_on_merge_request,
-             noteable: merge_request,
-             project: project,
-             position: position
-            ).to_discussion
+      create(
+        :diff_note_on_merge_request,
+        noteable: merge_request,
+        project: project,
+        position: position
+      ).to_discussion
     end
 
     let!(:second_discussion) do
-      create(:diff_note_on_merge_request,
-             noteable: merge_request,
-             project: project,
-             position: position
-            ).to_discussion
+      create(
+        :diff_note_on_merge_request,
+        noteable: merge_request,
+        project: project,
+        position: position
+      ).to_discussion
     end
 
     let(:first_discussion_selector) { ".discussion[data-discussion-id='#{first_discussion.id}']" }
@@ -74,11 +77,12 @@
 
       context 'with resolved threads' do
         let!(:resolved_discussion) do
-          create(:diff_note_on_merge_request,
-                 noteable: merge_request,
-                 project: project,
-                 position: position
-                ).to_discussion
+          create(
+            :diff_note_on_merge_request,
+            noteable: merge_request,
+            project: project,
+            position: position
+          ).to_discussion
         end
 
         let(:resolved_discussion_selector) { ".discussion[data-discussion-id='#{resolved_discussion.id}']" }
@@ -92,7 +96,7 @@
         end
 
         it 'excludes resolved threads during navigation',
-            quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/383687' do
+          quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/383687' do
           goto_next_thread
           goto_next_thread
           goto_next_thread

spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'Merge request > User sees merge button depending on unresolved threads', :js,
-feature_category: :code_review_workflow do
+  feature_category: :code_review_workflow do
   let(:project)        { create(:project, :repository) }
   let(:user)           { project.creator }
   let!(:merge_request) { create(:merge_request_with_diff_notes, source_project: project, author: user) }

spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb

@@ -36,11 +36,13 @@
 
   context 'when a user created a merge request in the parent project' do
     let!(:merge_request) do
-      create(:merge_request,
-              source_project: project,
-              target_project: project,
-              source_branch: 'feature',
-              target_branch: 'master')
+      create(
+        :merge_request,
+        source_project: project,
+        target_project: project,
+        source_branch: 'feature',
+        target_branch: 'master'
+      )
     end
 
     let!(:push_pipeline) do
@@ -263,11 +265,13 @@
 
   context 'when a user created a merge request from a forked project to the parent project', :sidekiq_might_not_need_inline do
     let(:merge_request) do
-      create(:merge_request,
-              source_project: forked_project,
-              target_project: project,
-              source_branch: 'feature',
-              target_branch: 'master')
+      create(
+        :merge_request,
+        source_project: forked_project,
+        target_project: project,
+        source_branch: 'feature',
+        target_branch: 'master'
+      )
     end
 
     let!(:push_pipeline) do

spec/features/merge_request/user_sees_merge_widget_spec.rb

@@ -118,12 +118,15 @@ def click_expand_button
   context 'view merge request with failed GitLab CI pipelines' do
     before do
       commit_status = create(:commit_status, project: project, status: 'failed')
-      pipeline = create(:ci_pipeline, project: project,
-                                      sha: merge_request.diff_head_sha,
-                                      ref: merge_request.source_branch,
-                                      status: 'failed',
-                                      statuses: [commit_status],
-                                      head_pipeline_of: merge_request)
+      pipeline = create(
+        :ci_pipeline,
+        project: project,
+        sha: merge_request.diff_head_sha,
+        ref: merge_request.source_branch,
+        status: 'failed',
+        statuses: [commit_status],
+        head_pipeline_of: merge_request
+      )
       create(:ci_build, :pending, pipeline: pipeline)
 
       visit project_merge_request_path(project, merge_request)
@@ -278,12 +281,15 @@ def click_expand_button
   context 'view merge request with MWBS button' do
     before do
       commit_status = create(:commit_status, project: project, status: 'pending')
-      pipeline = create(:ci_pipeline, project: project,
-                                      sha: merge_request.diff_head_sha,
-                                      ref: merge_request.source_branch,
-                                      status: 'pending',
-                                      statuses: [commit_status],
-                                      head_pipeline_of: merge_request)
+      pipeline = create(
+        :ci_pipeline,
+        project: project,
+        sha: merge_request.diff_head_sha,
+        ref: merge_request.source_branch,
+        status: 'pending',
+        statuses: [commit_status],
+        head_pipeline_of: merge_request
+      )
       create(:ci_build, :pending, pipeline: pipeline)
 
       visit project_merge_request_path(project, merge_request)
@@ -298,9 +304,12 @@ def click_expand_button
 
   context 'view merge request where there is no pipeline yet' do
     before do
-      pipeline = create(:ci_pipeline, project: project,
-                                      sha: merge_request.diff_head_sha,
-                                      ref: merge_request.source_branch)
+      pipeline = create(
+        :ci_pipeline,
+        project: project,
+        sha: merge_request.diff_head_sha,
+        ref: merge_request.source_branch
+      )
       create(:ci_build, pipeline: pipeline)
 
       visit project_merge_request_path(project, merge_request)
@@ -510,11 +519,13 @@ def click_expand_button
 
   context 'when merge request has test reports' do
     let!(:head_pipeline) do
-      create(:ci_pipeline,
-             :success,
-             project: project,
-             ref: merge_request.source_branch,
-             sha: merge_request.diff_head_sha)
+      create(
+        :ci_pipeline,
+        :success,
+        project: project,
+        ref: merge_request.source_branch,
+        sha: merge_request.diff_head_sha
+      )
     end
 
     let!(:build) { create(:ci_build, :success, pipeline: head_pipeline, project: project) }

spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb

@@ -3,16 +3,19 @@
 require 'spec_helper'
 
 RSpec.describe 'Merge request > User sees MR from deleted forked project',
-               :js, feature_category: :code_review_workflow do
+  :js, feature_category: :code_review_workflow do
   include ProjectForksHelper
 
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:forked_project) { fork_project(project, nil, repository: true) }
   let!(:merge_request) do
-    create(:merge_request_with_diffs, source_project: forked_project,
-                                      target_project: project,
-                                      description: 'Test merge request')
+    create(
+      :merge_request_with_diffs,
+      source_project: forked_project,
+      target_project: project,
+      description: 'Test merge request'
+    )
   end
 
   before do

spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb

@@ -6,7 +6,7 @@
 # message to be shown by JavaScript when the source branch was deleted.
 # Please do not remove ":js".
 RSpec.describe 'Merge request > User sees MR with deleted source branch',
-               :js, feature_category: :code_review_workflow do
+  :js, feature_category: :code_review_workflow do
   let(:project) { create(:project, :public, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project) }
   let(:user) { project.creator }

spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb

@@ -9,15 +9,21 @@
   let(:user) { project.creator }
   let(:forked_project) { fork_project(project, nil, repository: true) }
   let!(:merge_request) do
-    create(:merge_request_with_diffs, source_project: forked_project,
-                                      target_project: project,
-                                      description: 'Test merge request')
+    create(
+      :merge_request_with_diffs,
+      source_project: forked_project,
+      target_project: project,
+      description: 'Test merge request'
+    )
   end
 
   before do
-    create(:note_on_commit, note: 'A commit comment',
-                            project: forked_project,
-                            commit_id: merge_request.commit_shas.first)
+    create(
+      :note_on_commit,
+      note: 'A commit comment',
+      project: forked_project,
+      commit_id: merge_request.commit_shas.first
+    )
     sign_in(user)
   end
 

spec/features/merge_request/user_sees_pipelines_from_forked_project_spec.rb

@@ -3,23 +3,28 @@
 require 'spec_helper'
 
 RSpec.describe 'Merge request > User sees pipelines from forked project', :js,
-feature_category: :continuous_integration do
+  feature_category: :continuous_integration do
   include ProjectForksHelper
 
   let(:target_project) { create(:project, :public, :repository) }
   let(:user) { target_project.creator }
   let(:forked_project) { fork_project(target_project, nil, repository: true) }
   let!(:merge_request) do
-    create(:merge_request_with_diffs, source_project: forked_project,
-                                      target_project: target_project,
-                                      description: 'Test merge request')
+    create(
+      :merge_request_with_diffs,
+      source_project: forked_project,
+      target_project: target_project,
+      description: 'Test merge request'
+    )
   end
 
   let(:pipeline) do
-    create(:ci_pipeline,
-           project: forked_project,
-           sha: merge_request.diff_head_sha,
-           ref: merge_request.source_branch)
+    create(
+      :ci_pipeline,
+      project: forked_project,
+      sha: merge_request.diff_head_sha,
+      ref: merge_request.source_branch
+    )
   end
 
   before do

spec/features/merge_request/user_sees_pipelines_spec.rb

@@ -15,11 +15,13 @@
 
     context 'with pipelines' do
       let!(:pipeline) do
-        create(:ci_pipeline,
-               :success,
-               project: merge_request.source_project,
-               ref: merge_request.source_branch,
-               sha: merge_request.diff_head_sha)
+        create(
+          :ci_pipeline,
+          :success,
+          project: merge_request.source_project,
+          ref: merge_request.source_branch,
+          sha: merge_request.diff_head_sha
+        )
       end
 
       let!(:manual_job) { create(:ci_build, :manual, name: 'job1', stage: 'deploy', pipeline: pipeline) }
@@ -116,9 +118,14 @@
     let_it_be(:reporter_in_parent_and_developer_in_fork) { create(:user) }
 
     let(:merge_request) do
-      create(:merge_request, :with_detached_merge_request_pipeline,
-                             source_project: forked_project, source_branch: 'feature',
-                             target_project: parent_project, target_branch: 'master')
+      create(
+        :merge_request,
+        :with_detached_merge_request_pipeline,
+        source_project: forked_project,
+        source_branch: 'feature',
+        target_project: parent_project,
+        target_branch: 'master'
+      )
     end
 
     let(:config) do

spec/features/merge_request/user_sees_versions_spec.rb

@@ -57,9 +57,9 @@
     end
 
     it_behaves_like 'allows commenting',
-                    file_name: '.gitmodules',
-                    line_text: '[submodule "six"]',
-                    comment: 'Typo, please fix.'
+      file_name: '.gitmodules',
+      line_text: '[submodule "six"]',
+      comment: 'Typo, please fix.'
   end
 
   describe 'switch between versions' do
@@ -105,9 +105,9 @@
     end
 
     it_behaves_like 'allows commenting',
-                    file_name: '.gitmodules',
-                    line_text: 'path = six',
-                    comment: 'Typo, please fix.'
+      file_name: '.gitmodules',
+      line_text: 'path = six',
+      comment: 'Typo, please fix.'
   end
 
   describe 'compare with older version' do
@@ -172,9 +172,9 @@
     end
 
     it_behaves_like 'allows commenting',
-                    file_name: '.gitmodules',
-                    line_text: '[submodule "gitlab-shell"]',
-                    comment: 'Typo, please fix.'
+      file_name: '.gitmodules',
+      line_text: '[submodule "gitlab-shell"]',
+      comment: 'Typo, please fix.'
   end
 
   describe 'compare with same version' do
@@ -239,8 +239,8 @@
     end
 
     it_behaves_like 'allows commenting',
-                    file_name: 'files/ruby/popen.rb',
-                    line_text: 'RuntimeError',
-                    comment: 'Typo, please fix.'
+      file_name: 'files/ruby/popen.rb',
+      line_text: 'RuntimeError',
+      comment: 'Typo, please fix.'
   end
 end