From 6c1209f51f366eaea2cdceb121b71ea8fa52628f Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Tue, 12 Mar 2024 11:29:51 +0000
Subject: [PATCH] Update person age hint

---
 app/models/form/lettings/questions/age.rb           | 11 ++++++++++-
 app/models/form/sales/questions/person_age.rb       |  6 ++++++
 spec/models/form/lettings/pages/person_age_spec.rb  |  2 +-
 spec/models/form/lettings/questions/age_spec.rb     |  2 +-
 spec/models/form/sales/questions/person_age_spec.rb |  2 +-
 spec/models/lettings_log_spec.rb                    |  4 ----
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/models/form/lettings/questions/age.rb b/app/models/form/lettings/questions/age.rb
index 26f7527d6..0a457203c 100644
--- a/app/models/form/lettings/questions/age.rb
+++ b/app/models/form/lettings/questions/age.rb
@@ -11,9 +11,10 @@ class Form::Lettings::Questions::Age < ::Form::Question
     @max = 120
     @min = 1
     @step = 1
-    @hint_text = "For a child under 1, enter 1" if person_type == "child"
     @person_index = person_index
     @question_number = question_number
+    @person_type = person_type
+    @hint_text = hint_text
   end
 
   def question_number
@@ -26,4 +27,12 @@ class Form::Lettings::Questions::Age < ::Form::Question
 
     base_question_number + (4 * @person_index)
   end
+
+  def hint_text
+    if form.start_year_after_2024?
+      "Answer 1 for children aged under 1 year old"
+    elsif @person_type == "child"
+      "For a child under 1, enter 1"
+    end
+  end
 end
diff --git a/app/models/form/sales/questions/person_age.rb b/app/models/form/sales/questions/person_age.rb
index 34944c8f1..9f3d9378f 100644
--- a/app/models/form/sales/questions/person_age.rb
+++ b/app/models/form/sales/questions/person_age.rb
@@ -27,4 +27,10 @@ class Form::Sales::Questions::PersonAge < ::Form::Question
 
     base_question_number + (4 * @person_index)
   end
+
+  def hint_text
+    if form.start_year_after_2024?
+      "Answer 1 for children aged under 1 year old"
+    end
+  end
 end
diff --git a/spec/models/form/lettings/pages/person_age_spec.rb b/spec/models/form/lettings/pages/person_age_spec.rb
index 483784e5c..562d91cfa 100644
--- a/spec/models/form/lettings/pages/person_age_spec.rb
+++ b/spec/models/form/lettings/pages/person_age_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Pages::PersonAge, type: :model do
   subject(:page) { described_class.new(nil, page_definition, subsection, person_index:, person_type:) }
 
   let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1))) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_after_2024?: false)) }
   let(:person_index) { 2 }
   let(:person_type) { "non_child" }
 
diff --git a/spec/models/form/lettings/questions/age_spec.rb b/spec/models/form/lettings/questions/age_spec.rb
index bdd2f0a21..85659fc8f 100644
--- a/spec/models/form/lettings/questions/age_spec.rb
+++ b/spec/models/form/lettings/questions/age_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Questions::Age, type: :model do
   subject(:question) { described_class.new(nil, question_definition, page, person_index:, person_type:) }
 
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 4)))) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 4), start_year_after_2024?: false))) }
   let(:person_index) { 2 }
   let(:person_type) { "non_child" }
 
diff --git a/spec/models/form/sales/questions/person_age_spec.rb b/spec/models/form/sales/questions/person_age_spec.rb
index 983d5667e..55a2dc020 100644
--- a/spec/models/form/sales/questions/person_age_spec.rb
+++ b/spec/models/form/sales/questions/person_age_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PersonAge, type: :model do
 
   let(:question_id) { "age3" }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
   let(:person_index) { 2 }
 
   it "has correct page" do
diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb
index a09288da8..9bc9cb54a 100644
--- a/spec/models/lettings_log_spec.rb
+++ b/spec/models/lettings_log_spec.rb
@@ -119,10 +119,6 @@ RSpec.describe LettingsLog do
       expect(validator).to receive(:validate_person_age_and_relationship_matches_economic_status)
     end
 
-    it "validates child is over 12 years younger than lead tenant" do
-      expect(validator).to receive(:validate_child_12_years_younger)
-    end
-
     it "validates bedroom number" do
       expect(validator).to receive(:validate_shared_housing_rooms)
     end