Browse Source

Update person age hint

pull/2256/head
Kat 2 years ago
parent
commit
6c1209f51f
  1. 11
      app/models/form/lettings/questions/age.rb
  2. 6
      app/models/form/sales/questions/person_age.rb
  3. 2
      spec/models/form/lettings/pages/person_age_spec.rb
  4. 2
      spec/models/form/lettings/questions/age_spec.rb
  5. 2
      spec/models/form/sales/questions/person_age_spec.rb
  6. 4
      spec/models/lettings_log_spec.rb

11
app/models/form/lettings/questions/age.rb

@ -11,9 +11,10 @@ class Form::Lettings::Questions::Age < ::Form::Question
@max = 120 @max = 120
@min = 1 @min = 1
@step = 1 @step = 1
@hint_text = "For a child under 1, enter 1" if person_type == "child"
@person_index = person_index @person_index = person_index
@question_number = question_number @question_number = question_number
@person_type = person_type
@hint_text = hint_text
end end
def question_number def question_number
@ -26,4 +27,12 @@ class Form::Lettings::Questions::Age < ::Form::Question
base_question_number + (4 * @person_index) base_question_number + (4 * @person_index)
end 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 end

6
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) base_question_number + (4 * @person_index)
end end
def hint_text
if form.start_year_after_2024?
"Answer 1 for children aged under 1 year old"
end
end
end end

2
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:) } subject(:page) { described_class.new(nil, page_definition, subsection, person_index:, person_type:) }
let(:page_definition) { nil } 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_index) { 2 }
let(:person_type) { "non_child" } let(:person_type) { "non_child" }

2
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:) } subject(:question) { described_class.new(nil, question_definition, page, person_index:, person_type:) }
let(:question_definition) { nil } 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_index) { 2 }
let(:person_type) { "non_child" } let(:person_type) { "non_child" }

2
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_id) { "age3" }
let(:question_definition) { nil } 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 } let(:person_index) { 2 }
it "has correct page" do it "has correct page" do

4
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) expect(validator).to receive(:validate_person_age_and_relationship_matches_economic_status)
end 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 it "validates bedroom number" do
expect(validator).to receive(:validate_shared_housing_rooms) expect(validator).to receive(:validate_shared_housing_rooms)
end end

Loading…
Cancel
Save