Merge pull request #3944 from nhsuk/has-multiple-dates-not-today

thomasleese · web-flow · commit fdee14726608 · 2025-07-14T11:54:38.000+01:00
Use future dates in has_multiple_dates
diff --git a/app/lib/govuk_notify_personalisation.rb b/app/lib/govuk_notify_personalisation.rb
@@ -162,11 +162,7 @@ def full_and_preferred_patient_name
   def has_multiple_dates
     return nil if session.nil?
 
-    if session.today_or_future_dates.length > 1
-      "yes"
-    else
-      "no"
-    end
+    session.future_dates.length > 1 ? "yes" : "no"
   end
 
   def host
diff --git a/spec/lib/govuk_notify_personalisation_spec.rb b/spec/lib/govuk_notify_personalisation_spec.rb
@@ -104,6 +104,7 @@
 
     it "doesn't show today's date in next date" do
       expect(to_h).to include(
+        has_multiple_dates: "no",
         next_or_today_session_date: Date.current.to_fs(:short_day_of_week),
         next_session_date: Date.tomorrow.to_fs(:short_day_of_week)
       )

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@`
`104`	`104`
`105`	`105`	`it "doesn't show today's date in next date" do`
`106`	`106`	`expect(to_h).to include(`
	`107`	`+ has_multiple_dates: "no",`
`107`	`108`	`next_or_today_session_date: Date.current.to_fs(:short_day_of_week),`
`108`	`109`	`next_session_date: Date.tomorrow.to_fs(:short_day_of_week)`
`109`	`110`	`)`