Merge pull request #1737 from DFE-Digital/fixes-for-rails-7-1

Upgrade Sidekiq for Rails 7.1
DFE-Digital · Oct 5, 2023 · 011c069 · 011c069
2 parents e2b1955 + 9fe566d
commit 011c069
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 46 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,8 +18,8 @@ gem "faraday"
 gem "indefinite_article"
 gem "jsbundling-rails"
 gem "okcomputer"
-gem "omniauth-azure-activedirectory-v2", "~> 2.1"
-gem "omniauth-rails_csrf_protection", "~> 1.0"
+gem "omniauth-azure-activedirectory-v2"
+gem "omniauth-rails_csrf_protection"
 gem "pagy"
 gem "pg"
 gem "propshaft"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -141,7 +141,7 @@ GEM
     cgi (0.3.6)
     climate_control (1.2.0)
     concurrent-ruby (1.2.2)
-    connection_pool (2.4.0)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -216,7 +216,7 @@ GEM
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
-    ffi (1.15.5)
+    ffi (1.16.3)
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
@@ -263,7 +263,7 @@ GEM
     govuk_markdown (2.0.1)
       activesupport
       redcarpet
-    haml (6.1.1)
+    haml (6.2.3)
       temple (>= 0.8.2)
       thor
       tilt
@@ -277,8 +277,9 @@ GEM
     indefinite_article (0.2.5)
       activesupport
     io-console (0.6.0)
-    irb (1.6.4)
-      reline (>= 0.3.0)
+    irb (1.8.1)
+      rdoc
+      reline (>= 0.3.8)
     jsbundling-rails (1.2.1)
       railties (>= 6.0.0)
     json (2.6.3)
@@ -304,12 +305,12 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.20.0)
-    msgpack (1.6.1)
+    msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
     mutex_m (0.1.2)
-    net-http-persistent (4.0.1)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
     net-imap (0.4.0)
       date
@@ -353,7 +354,7 @@ GEM
     os (1.1.4)
     pagy (6.1.0)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
@@ -363,6 +364,8 @@ GEM
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
+    psych (5.1.0)
+      stringio
     public_suffix (5.0.3)
     puma (6.4.0)
       nio4r (~> 2.0)
@@ -413,11 +416,13 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.0.6)
-    rbs (3.0.3)
+    rbs (3.2.2)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
     regexp_parser (2.8.1)
-    reline (0.3.3)
+    reline (0.3.9)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -440,7 +445,7 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (6.0.3)
@@ -451,7 +456,7 @@ GEM
       rspec-expectations (~> 3.12)
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rubocop (1.55.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -465,9 +470,9 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
+    rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
     rubocop-govuk (4.12.0)
       rubocop (= 1.55.0)
@@ -496,7 +501,7 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.5.8)
+    sidekiq (6.5.11)
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
@@ -515,12 +520,13 @@ GEM
       addressable (~> 2.8)
       capybara (~> 3.27)
       site_prism-all_there (~> 2.0)
-    site_prism-all_there (2.0.1)
+    site_prism-all_there (2.0.2)
     sitemap_generator (6.3.0)
       builder (~> 3.0)
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
+    stringio (3.0.8)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
     syntax_tree-haml (4.0.3)
@@ -531,9 +537,9 @@ GEM
       prettier_print
       rbs
       syntax_tree (>= 2.0.1)
-    temple (0.10.0)
+    temple (0.10.3)
     thor (1.2.2)
-    tilt (2.1.0)
+    tilt (2.3.0)
     timeout (0.4.0)
     trailblazer-option (0.1.2)
     tzinfo (2.0.6)
@@ -542,7 +548,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
@@ -606,8 +612,8 @@ DEPENDENCIES
   jsbundling-rails
   mail-notify
   okcomputer
-  omniauth-azure-activedirectory-v2 (~> 2.1)
-  omniauth-rails_csrf_protection (~> 1.0)
+  omniauth-azure-activedirectory-v2
+  omniauth-rails_csrf_protection
   pagy
   pg
   prettier_print

diff --git a/config/initializers/govuk_markdown.rb b/config/initializers/govuk_markdown.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class MarkdownTemplate
   def self.call(template, source)
     erb_handler = ActionView::Template.registered_template_handler(:erb)
     compiled_source = erb_handler.call(template, source)
-    "GovukMarkdown.render(begin;#{compiled_source};end).html_safe"
+    "GovukMarkdown.render(begin;#{compiled_source};end.to_str).html_safe"
   end
 end
 

diff --git a/db/migrate/20220801091806_add_region_to_application_form.rb b/db/migrate/20220801091806_add_region_to_application_form.rb
@@ -1,13 +1,6 @@
 class AddRegionToApplicationForm < ActiveRecord::Migration[7.0]
   def up
     add_reference :application_forms, :region, foreign_key: true, null: true
-
-    ApplicationForm.find_each do |application_form|
-      eligibility_check =
-        EligibilityCheck.find(application_form.eligibility_check_id)
-      application_form.update!(region_id: eligibility_check.region_id)
-    end
-
     change_column_null :application_forms, :region_id, false
   end
 

diff --git a/db/schema.rb b/db/schema.rb