Merge branch '239356-fix-Style/CombinableLoops' into 'master'

Fix Style/CombinableLoops offenses

See merge request !169977



Merged-by: Peter Leitzen <pleitzen@gitlab.com>
Approved-by: Adam Hegyi <ahegyi@gitlab.com>
Approved-by: Peter Leitzen <pleitzen@gitlab.com>
Co-authored-by: Jonston Chan <jonstonchan1@gmail.com>

.rubocop_todo/style/combinable_loops.yml

----
-# Cop supports --autocorrect.
-Style/CombinableLoops:
-  Exclude:
-    - 'ee/db/fixtures/development/30_customizable_cycle_analytics.rb'
-    - 'ee/lib/gitlab/audit/events/preloader.rb'
-    - 'ee/spec/finders/snippets_finder_spec.rb'
-    - 'spec/features/merge_request/user_suggests_changes_on_diff_spec.rb'
-    - 'spec/finders/packages/group_packages_finder_spec.rb'
-    - 'spec/requests/api/members_spec.rb'

ee/db/fixtures/development/30_customizable_cycle_analytics.rb

@@ -174,9 +174,7 @@ def seed_merge_request_based_stages!
     merge_requests.pop(5).each do |mr|
       travel_to(get_date_after(mr.created_at))
       MergeRequests::CloseService.new(project: project, current_user: user).execute(mr)
-    end
 
-    merge_requests.pop(5).each do |mr|
       travel_to(get_date_after(mr.created_at))
       mr.metrics.update!(merged_at: Time.now)
       MergeRequestsClosingIssues.create!(issue: project.issues.sample, merge_request: mr)

ee/lib/gitlab/audit/events/preloader.rb

@@ -19,6 +19,7 @@ def initialize(audit_events)
 
         def find_each(&block)
           @audit_events.each_batch(column: :created_at) do |relation|
+            # rubocop:disable Style/CombinableLoops -- BatchLoader must preload all associated records before yielding (https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169977#note_2175391750)
             relation.each do |audit_event|
               audit_event.lazy_author
               audit_event.entity
@@ -27,6 +28,7 @@ def find_each(&block)
             relation.each do |audit_event|
               yield(audit_event)
             end
+            # rubocop:enable Style/CombinableLoops
 
             BatchLoader::Executor.clear_current
           end

ee/spec/finders/snippets_finder_spec.rb

@@ -69,9 +69,7 @@
               private_project_snippet
             )
         end
-      end
 
-      [:guest, :reporter, :developer, :maintainer].each do |role|
         it 'returns all the authorized project snippets and authored personal ones' do
           project.add_role(user, role)
           other_project.add_role(user, role)

spec/features/merge_request/user_suggests_changes_on_diff_spec.rb

@@ -135,6 +135,7 @@ def hash(path)
     end
 
     it 'can add and remove suggestions from a batch' do
+      # rubocop:disable Style/CombinableLoops -- "Add suggestion to batch" only exists with more than one suggestion
       files.each_with_index do |file, index|
         page.within("[id='#{file[:hash]}']") do
           find('.js-diff-more-actions').click
@@ -166,6 +167,7 @@ def hash(path)
             expect(page).to have_content("Apply #{index + 1} suggestions")
           end
         end
+        # rubocop:enable Style/CombinableLoops
       end
 
       page.within("[id='#{files[0][:hash]}']") do

spec/finders/packages/group_packages_finder_spec.rb

@@ -252,12 +252,10 @@ def self.package_types
     end
 
     context 'group has package of all types' do
-      package_types.each do |pt| # rubocop:disable RSpec/UselessDynamicDefinition -- `pt` used in `let`
-        let_it_be("package_#{pt}") { create("#{pt}_package", project: project) }
-      end
+      package_types.each do |type| # rubocop:disable RSpec/UselessDynamicDefinition -- `type` used in `let`
+        let_it_be("package_#{type}") { create("#{type}_package", project: project) }
 
-      package_types.each do |package_type|
-        it_behaves_like 'with package type', package_type
+        it_behaves_like 'with package type', type
       end
     end
 

spec/requests/api/members_spec.rb

@@ -1045,6 +1045,7 @@ def request
     end
   end
 
+  # rubocop:disable Style/CombinableLoops -- new projects and groups must not be created for specs to pass
   [false, true].each do |all|
     it_behaves_like 'GET /:source_type/:id/members/(all)', 'project', all do
       let(:source) { project }
@@ -1064,6 +1065,7 @@ def request
       let(:source) { all ? create(:group, parent: group) : group }
     end
   end
+  # rubocop:enable Style/CombinableLoops
 
   describe 'POST /projects/:id/members' do
     context 'adding owner to project' do