Merge branch 'main' into feature/pseudo-random-urn-generator

Gemfile

@@ -42,7 +42,7 @@ gem "httparty", "~> 0.21"
 gem "invisible_captcha"
 gem "omniauth-azure-activedirectory-v2"
 gem "rolify"
-gem "sentry-rails", "~> 5.11"
+gem "sentry-rails", "~> 5.12"
 
 group :test do
   gem "shoulda-matchers", "~> 5.0"

Gemfile.lock

@@ -111,7 +111,7 @@ GEM
       reline (>= 0.3.1)
     debug_inspector (1.1.0)
     deep_merge (1.2.2)
-    devise (4.9.2)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -218,7 +218,7 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -335,7 +335,7 @@ GEM
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
@@ -402,10 +402,10 @@ GEM
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     semantic_range (3.0.0)
-    sentry-rails (5.11.0)
+    sentry-rails (5.12.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.11.0)
-    sentry-ruby (5.11.0)
+      sentry-ruby (~> 5.12.0)
+    sentry-ruby (5.12.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
@@ -461,7 +461,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
@@ -507,7 +507,7 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   scenic
-  sentry-rails (~> 5.11)
+  sentry-rails (~> 5.12)
   shoulda-matchers (~> 5.0)
   sidekiq (~> 6.5)
   sidekiq-cron (~> 1.10)

app/models/form/eligibility_check.rb

@@ -40,6 +40,8 @@ def failure_reason
   end
 
   def date_of_entry_eligible?(date_of_entry, start_date)
+    return false unless date_of_entry && start_date
+
     date_of_entry >= start_date - 3.months
   end
 

app/queries/forms_funnel_query.rb

@@ -63,7 +63,7 @@ def entry_date_step_query(required_field)
 
     form_dates = date_of_entries.each_with_object([]) do |(id, date_of_entry), list|
       entry = start_dates.detect { |(sid, _)| sid == id }
-      list << [date_of_entry.to_date, entry.last.to_date]
+      list << [date_of_entry.to_date, entry&.last&.to_date]
       list
     end
 

config/locales/steps.en.yml

@@ -84,7 +84,7 @@ en:
         teacher:
           Physics, general or combined science including physics, and languages can be combined with other subjects but must make up at least 50% of your time in the classroom. 
         salaried_trainee:
-          Physics or languages can be combined with other subjects but must make up at least 50% of your course content. This will be validated by Department for Education with the school where you are training.
+          Physics or languages can be combined with other subjects but must make up at least 50% of your course content.
       answers:
         physics:
           text: Physics

spec/steps/subject_step_spec.rb

@@ -28,7 +28,7 @@
   context "salaried_trainee" do
     let(:form) { build(:trainee_form) }
 
-    question_hint = "Physics or languages can be combined with other subjects but must make up at least 50% of your course content. This will be validated by Department for Education with the school where you are training."
+    question_hint = "Physics or languages can be combined with other subjects but must make up at least 50% of your course content."
 
     include_examples "behaves like a step",
                      described_class,