Bump rubocop-govuk from 4.18.0 to 5.0.2

.rubocop.yml

@@ -11,7 +11,11 @@ inherit_mode:
   merge:
     - Exclude
 
-require: rubocop-performance
+require:
+  - rubocop-factory_bot
+  - rubocop-performance
+  - rubocop-rspec
+  - rubocop-capybara
 
 AllCops:
   TargetRubyVersion: 3.3.4

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.63.5.
+# using RuboCop version 1.64.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -17,7 +17,7 @@ Lint/SuppressedException:
   Exclude:
     - 'lib/tasks/cms.rake'
 
-# Offense count: 9
+# Offense count: 8
 RSpec/LetSetup:
   Exclude:
     - 'spec/jobs/complete_registration_mail_job_spec.rb'
@@ -26,6 +26,28 @@ RSpec/LetSetup:
     - 'spec/jobs/start_training_mail_job_spec.rb'
     - 'spec/jobs/test_bulk_mail_job_spec.rb'
 
+# Offense count: 1
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
+RSpec/NoExpectationExample:
+  Exclude:
+    - 'spec/support/shared/email_prompt.rb'
+
+# Offense count: 12
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/ReceiveMessages:
+  Exclude:
+    - 'spec/controllers/users/omniauth_callbacks_controller_spec.rb'
+    - 'spec/helpers/link_helper_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: constant, string
+RSpec/VerifiedDoubleReference:
+  Exclude:
+    - 'spec/services/gov_one_auth_service_spec.rb'
+
 # Offense count: 2
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
@@ -54,18 +76,15 @@ Rails/Output:
     - 'app/services/content_integrity.rb'
     - 'app/services/dashboard.rb'
 
-# Offense count: 16
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowImplicitReturn, AllowedReceivers.
 Rails/SaveBang:
   Exclude:
-    - 'app/controllers/training/responses_controller.rb'
     - 'app/forms/registration/setting_type_form.rb'
     - 'app/models/user.rb'
     - 'app/services/assessment_progress.rb'
     - 'config/sitemap.rb'
-    - 'lib/content_seed.rb'
-    - 'lib/migrate_training.rb'
     - 'lib/seed_images.rb'
     - 'spec/forms/registration/setting_type_form_spec.rb'
 
@@ -83,9 +102,3 @@ Rails/Validation:
 Style/EmptyCaseCondition:
   Exclude:
     - 'app/decorators/next_page_decorator.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'app/services/module_progress.rb'

Gemfile

@@ -83,6 +83,7 @@ group :development, :test do
   gem 'foreman'
   gem 'pry-byebug'
   gem 'pry-rails'
+  gem 'rubocop-factory_bot', require: false
   gem 'rubocop-govuk', require: false
   gem 'rubocop-performance', require: false
 end

Gemfile.lock

@@ -373,7 +373,7 @@ GEM
     os (1.1.4)
     pagy (8.6.3)
     parallel (1.25.1)
-    parser (3.3.3.0)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
@@ -506,31 +506,27 @@ GEM
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.0)
-      rubocop (~> 1.41)
-    rubocop-govuk (4.18.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-govuk (5.0.2)
       rubocop (= 1.64.1)
       rubocop-ast (= 1.31.3)
-      rubocop-rails (= 2.25.0)
+      rubocop-capybara (= 2.21.0)
+      rubocop-rails (= 2.25.1)
       rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 2.30.0)
+      rubocop-rspec (= 3.0.1)
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.0)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.30.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.0)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
@@ -681,6 +677,7 @@ DEPENDENCIES
   rails-erd
   redcarpet
   rspec-rails
+  rubocop-factory_bot
   rubocop-govuk
   rubocop-performance
   sentry-rails

spec/jobs/continue_training_mail_job_spec.rb

@@ -5,24 +5,24 @@
 
   let(:user) { create(:user, :registered, confirmed_at: 4.weeks.ago) }
 
-  let(:user_2) do
+  let(:user_two) do
     create :user, :registered,
            confirmed_at: 4.weeks.ago,
            module_time_to_completion: { alpha: 0 }
   end
 
-  let(:user_3) do
+  let(:user_three) do
     create :user, :registered,
            confirmed_at: 4.weeks.ago,
            module_time_to_completion: { alpha: 0 }
   end
 
   let!(:included) { [user] }
-  let!(:excluded) { [user_2, user_3] }
+  let!(:excluded) { [user_two, user_three] }
 
   # Must have started, but not completed training.
   # Must be 4 weeks since their last visit
-  # `user_2` won't be included because they have a visit from 2 weeks ago
+  # `user_two` won't be included because they have a visit from 2 weeks ago
   before do
     create :visit,
            id: 9,
@@ -33,19 +33,19 @@
     create :visit,
            id: 7,
            visitor_token: '123',
-           user_id: user_2.id,
+           user_id: user_two.id,
            started_at: 4.weeks.ago
 
     create :visit,
            id: 8,
            visitor_token: '234',
-           user_id: user_2.id,
+           user_id: user_two.id,
            started_at: 2.weeks.ago
 
     create :visit,
            id: 10,
            visitor_token: '456',
-           user_id: user_3.id,
+           user_id: user_three.id,
            started_at: 5.weeks.ago
 
     # Travel to 4 weeks ago so that the module start event won't count as a recent visit

spec/models/data_analysis/modules_per_month_spec.rb

@@ -41,15 +41,15 @@
     ]
   end
 
-  let(:user_1) { create :user, :registered }
-  let(:user_2) { create :user, :registered }
+  let(:user_one) { create :user, :registered }
+  let(:user_two) { create :user, :registered }
 
   before do
-    create :assessment, :failed, user: user_1, completed_at: Time.zone.local(2023, 1, 1)
-    create :assessment, :passed, user: user_1, completed_at: Time.zone.local(2023, 1, 1)
-    create :assessment, :failed, user: user_1, completed_at: Time.zone.local(2023, 2, 1)
-    create :assessment, :passed, user: user_2, completed_at: Time.zone.local(2023, 3, 1)
-    create :assessment, user: user_2, training_module: 'bravo'
+    create :assessment, :failed, user: user_one, completed_at: Time.zone.local(2023, 1, 1)
+    create :assessment, :passed, user: user_one, completed_at: Time.zone.local(2023, 1, 1)
+    create :assessment, :failed, user: user_one, completed_at: Time.zone.local(2023, 2, 1)
+    create :assessment, :passed, user: user_two, completed_at: Time.zone.local(2023, 3, 1)
+    create :assessment, user: user_two, training_module: 'bravo'
   end
 
   it_behaves_like 'a data export model'

spec/models/data_analysis/resits_per_user_spec.rb

@@ -14,32 +14,32 @@
     [
       {
         module_name: 'alpha',
-        user_id: user_1.id,
+        user_id: user_one.id,
         role_type: 'resit',
         resit_attempts: 1,
       },
       {
         module_name: 'alpha',
-        user_id: user_3.id,
+        user_id: user_three.id,
         role_type: 'failing',
         resit_attempts: 2,
       },
     ]
   end
 
-  let(:user_1) { create :user, :registered, role_type: 'resit' }
-  let(:user_2) { create :user, :registered, role_type: 'hole-in-one' }
-  let(:user_3) { create :user, :registered, role_type: 'failing' }
+  let(:user_one) { create :user, :registered, role_type: 'resit' }
+  let(:user_two) { create :user, :registered, role_type: 'hole-in-one' }
+  let(:user_three) { create :user, :registered, role_type: 'failing' }
 
   before do
-    create :assessment, :failed, user: user_1
-    create :assessment, :passed, user: user_1
+    create :assessment, :failed, user: user_one
+    create :assessment, :passed, user: user_one
 
-    create :assessment, :passed, user: user_2
+    create :assessment, :passed, user: user_two
 
-    create :assessment, :failed, user: user_3
-    create :assessment, :failed, user: user_3
-    create :assessment, :failed, user: user_3
+    create :assessment, :failed, user: user_three
+    create :assessment, :failed, user: user_three
+    create :assessment, :failed, user: user_three
   end
 
   it_behaves_like 'a data export model'

spec/models/data_analysis/role_pass_rate_spec.rb

@@ -23,13 +23,13 @@
     ]
   end
 
-  let(:user_1) { create :user, :registered, role_type: 'childminder' }
-  let(:user_2) { create :user, :registered, role_type: 'childminder' }
+  let(:user_one) { create :user, :registered, role_type: 'childminder' }
+  let(:user_two) { create :user, :registered, role_type: 'childminder' }
 
   before do
-    create :assessment, :failed, user: user_1
-    create :assessment, :passed, user: user_1
-    create :assessment, :passed, user: user_2
+    create :assessment, :failed, user: user_one
+    create :assessment, :passed, user: user_one
+    create :assessment, :passed, user: user_two
   end
 
   it_behaves_like 'a data export model'

spec/models/data_analysis/setting_pass_rate_spec.rb

@@ -23,13 +23,13 @@
     ]
   end
 
-  let(:user_1) { create :user, :agency_childminder }
-  let(:user_2) { create :user, :agency_childminder }
+  let(:user_one) { create :user, :agency_childminder }
+  let(:user_two) { create :user, :agency_childminder }
 
   before do
-    create :assessment, :failed, user: user_1
-    create :assessment, :passed, user: user_1
-    create :assessment, :passed, user: user_2
+    create :assessment, :failed, user: user_one
+    create :assessment, :passed, user: user_one
+    create :assessment, :passed, user: user_two
   end
 
   it_behaves_like 'a data export model'

spec/models/data_analysis/summative_quiz_spec.rb

@@ -1,14 +1,14 @@
 require 'rails_helper'
 
 RSpec.describe DataAnalysis::SummativeQuiz do
-  let(:user_1) { create :user, :agency_childminder }
-  let(:user_2) { create :user, :agency_childminder }
+  let(:user_one) { create :user, :agency_childminder }
+  let(:user_two) { create :user, :agency_childminder }
 
   before do
-    create :assessment, :failed, user: user_1
-    create :assessment, :passed, user: user_1
-    create :assessment, :failed, user: user_2
-    create :assessment, :passed, user: user_2
+    create :assessment, :failed, user: user_one
+    create :assessment, :passed, user: user_one
+    create :assessment, :failed, user: user_two
+    create :assessment, :passed, user: user_two
   end
 
   describe '.pass_rate' do