Merge pull request #2615 from alphagov/dependabot/bundler/rubocop-gov…

…uk-4.13.0

Bump rubocop-govuk from 4.12.0 to 4.13.0

Gemfile.lock

@@ -585,37 +585,38 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rubocop (1.55.0)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-govuk (4.12.0)
-      rubocop (= 1.55.0)
-      rubocop-ast (= 1.29.0)
-      rubocop-rails (= 2.20.2)
+    rubocop-govuk (4.13.0)
+      rubocop (= 1.59.0)
+      rubocop-ast (= 1.30.0)
+      rubocop-rails (= 2.23.0)
       rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 2.22.0)
-    rubocop-rails (2.20.2)
+      rubocop-rspec (= 2.25.0)
+    rubocop-rails (2.23.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.22.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)

db/migrate/20230802095323_strip_whitespace_from_users_names.rb

@@ -2,9 +2,9 @@ class StripWhitespaceFromUsersNames < ActiveRecord::Migration[7.0]
   NAME_HAS_LEADING_OR_TRAILING_SPACE = "name REGEXP('^\s+') OR name REGEXP('\s+$')".freeze
 
   def up
-    User.where(NAME_HAS_LEADING_OR_TRAILING_SPACE).each(&:save!)
+    User.where(NAME_HAS_LEADING_OR_TRAILING_SPACE).find_each(&:save!)
 
-    BatchInvitationUser.where(NAME_HAS_LEADING_OR_TRAILING_SPACE).each(&:save!)
+    BatchInvitationUser.where(NAME_HAS_LEADING_OR_TRAILING_SPACE).find_each(&:save!)
   end
 
   def down; end

db/migrate/20230911092404_strip_whitespace_from_organisation_names.rb

@@ -2,7 +2,7 @@ class StripWhitespaceFromOrganisationNames < ActiveRecord::Migration[7.0]
   NAME_HAS_LEADING_OR_TRAILING_SPACE = "name REGEXP('^\s+') OR name REGEXP('\s+$')".freeze
 
   def up
-    Organisation.where(NAME_HAS_LEADING_OR_TRAILING_SPACE).each(&:save!)
+    Organisation.where(NAME_HAS_LEADING_OR_TRAILING_SPACE).find_each(&:save!)
   end
 
   def down; end

db/migrate/20230925093142_strip_whitespace_from_batch_invitation_user_email.rb

@@ -1,6 +1,6 @@
 class StripWhitespaceFromBatchInvitationUserEmail < ActiveRecord::Migration[7.0]
   def change
-    BatchInvitationUser.where("email REGEXP ? OR email REGEXP ?", "^\\s+", "\\s+$").each do |biu|
+    BatchInvitationUser.where("email REGEXP ? OR email REGEXP ?", "^\\s+", "\\s+$").find_each do |biu|
       biu.update_attribute(:email, biu.email&.strip) # rubocop:disable Rails/SkipsModelValidations
     end
   end

db/migrate/20230925093143_strip_whitespace_from_batch_invitation_user_organisation_slug.rb

@@ -1,6 +1,6 @@
 class StripWhitespaceFromBatchInvitationUserOrganisationSlug < ActiveRecord::Migration[7.0]
   def change
-    BatchInvitationUser.where("organisation_slug REGEXP ? OR organisation_slug REGEXP ?", "^\\s+", "\\s+$").each do |biu|
+    BatchInvitationUser.where("organisation_slug REGEXP ? OR organisation_slug REGEXP ?", "^\\s+", "\\s+$").find_each do |biu|
       biu.update_attribute(:organisation_slug, biu.organisation_slug&.strip) # rubocop:disable Rails/SkipsModelValidations
     end
   end

db/migrate/20230925104847_strip_whitespace_from_user_name.rb

@@ -1,6 +1,6 @@
 class StripWhitespaceFromUserName < ActiveRecord::Migration[7.0]
   def change
-    User.where("name REGEXP ? OR name REGEXP ?", "^\\s+", "\\s+$").each do |u|
+    User.where("name REGEXP ? OR name REGEXP ?", "^\\s+", "\\s+$").find_each do |u|
       u.update_attribute(:name, u.name&.strip) # rubocop:disable Rails/SkipsModelValidations
     end
   end

db/migrate/20230925104848_strip_whitespace_from_batch_invitation_user_name.rb

@@ -1,6 +1,6 @@
 class StripWhitespaceFromBatchInvitationUserName < ActiveRecord::Migration[7.0]
   def change
-    BatchInvitationUser.where("name REGEXP ? OR name REGEXP ?", "^\\s+", "\\s+$").each do |u|
+    BatchInvitationUser.where("name REGEXP ? OR name REGEXP ?", "^\\s+", "\\s+$").find_each do |u|
       u.update_attribute(:name, u.name&.strip) # rubocop:disable Rails/SkipsModelValidations
     end
   end

db/migrate/20230925104849_strip_whitespace_from_organisation_name.rb

@@ -1,6 +1,6 @@
 class StripWhitespaceFromOrganisationName < ActiveRecord::Migration[7.0]
   def change
-    Organisation.where("name REGEXP ? OR name REGEXP ?", "^\\s+", "\\s+$").each do |o|
+    Organisation.where("name REGEXP ? OR name REGEXP ?", "^\\s+", "\\s+$").find_each do |o|
       o.update_attribute(:name, o.name&.strip) # rubocop:disable Rails/SkipsModelValidations
     end
   end

lib/user_permission_migrator.rb

@@ -11,7 +11,7 @@ def self.migrate(source:, target:)
 
     permission_mappings = permissions.to_h
 
-    User.all.each do |user|
+    User.all.find_each do |user|
       next unless user.has_access_to?(source_app)
 
       permissions = user.permissions_for(source_app)