Merge pull request #1884 from DFE-Digital/dependabot/bundler/rubocop-…

…govuk-4.13.0 Bump rubocop-govuk from 4.12.0 to 4.13.0
DFE-Digital · Dec 21, 2023 · 234974d · 234974d
2 parents da0b938 + 299535e
commit 234974d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 25 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -284,7 +284,7 @@ GEM
       reline (>= 0.3.8)
     jsbundling-rails (1.2.1)
       railties (>= 6.0.0)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
     language_server-protocol (3.17.0.3)
     loofah (2.22.0)
@@ -355,7 +355,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.1.4)
     pagy (6.2.0)
-    parallel (1.23.0)
+    parallel (1.24.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
@@ -423,7 +423,7 @@ GEM
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
-    regexp_parser (2.8.2)
+    regexp_parser (2.8.3)
     reline (0.4.1)
       io-console (~> 0.5)
     representable (3.2.0)
@@ -459,37 +459,38 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.12.1)
-    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)

diff --git a/app/forms/concerns/assessor_interface/updates_english_language_status.rb b/app/forms/concerns/assessor_interface/updates_english_language_status.rb
@@ -17,10 +17,8 @@ def initial_attributes(assessment_section)
 
         super.merge(
           english_language_section_passed:
-            (
-              english_language_section(assessment)&.passed &&
-                application_form.send(self::EXEMPTION_ATTR)
-            ),
+            english_language_section(assessment)&.passed &&
+              application_form.send(self::EXEMPTION_ATTR),
         )
       end
 

diff --git a/app/jobs/fetch_malware_scan_results_job.rb b/app/jobs/fetch_malware_scan_results_job.rb
@@ -5,6 +5,6 @@ def perform
     Upload
       .where(malware_scan_result: "pending")
       .where("created_at < ?", 5.minutes.ago)
-      .each { |upload| FetchMalwareScanResult.call(upload:) }
+      .find_each { |upload| FetchMalwareScanResult.call(upload:) }
   end
 end
diff --git a/app/lib/application_form_status_updater.rb b/app/lib/application_form_status_updater.rb
@@ -248,7 +248,7 @@ def needs_references_verified?
 
   def further_information_requests
     @further_information_requests ||=
-      assessment&.further_information_requests&.to_a || []
+      assessment&.further_information_requests.to_a
   end
 
   def professional_standing_requests
@@ -258,11 +258,11 @@ def professional_standing_requests
   end
 
   def qualification_requests
-    @qualification_requests ||= assessment&.qualification_requests&.to_a || []
+    @qualification_requests ||= assessment&.qualification_requests.to_a
   end
 
   def reference_requests
-    @reference_requests ||= assessment&.reference_requests&.to_a || []
+    @reference_requests ||= assessment&.reference_requests.to_a
   end
 
   def overdue?(requestables:)

diff --git a/db/migrate/20220908064656_add_rules_to_application_forms.rb b/db/migrate/20220908064656_add_rules_to_application_forms.rb
@@ -8,7 +8,7 @@ def change
 
     ApplicationForm
       .includes(:region)
-      .each do |application_form|
+      .find_each do |application_form|
         region = application_form.region
 
         application_form.update!(

diff --git a/lib/tasks/example_data.rake b/lib/tasks/example_data.rake
@@ -223,7 +223,7 @@ def create_requestables(application_form, assessment, state)
 end
 
 def create_application_forms
-  Region.all.each do |region|
+  Region.all.find_each do |region|
     application_form_traits_for(region).each do |traits|
       application_form = FactoryBot.create(:application_form, *traits, region:)