From c6455ba67c81578bd971f95a7aede5891142f24c Mon Sep 17 00:00:00 2001 From: Nat Dean-Lewis Date: Mon, 9 Mar 2026 10:00:22 +0000 Subject: [PATCH] CLDC-4248: make change for 25/26 also, and update layear too --- app/models/form/lettings/questions/layear.rb | 15 +++++++++++- .../form/lettings/questions/waityear.rb | 17 +------------- .../form/lettings/questions/layear_spec.rb | 23 ++++++++++++++++++- .../form/lettings/questions/waityear_spec.rb | 21 ----------------- 4 files changed, 37 insertions(+), 39 deletions(-) diff --git a/app/models/form/lettings/questions/layear.rb b/app/models/form/lettings/questions/layear.rb index d8fa0a3a8..2ae03212d 100644 --- a/app/models/form/lettings/questions/layear.rb +++ b/app/models/form/lettings/questions/layear.rb @@ -8,7 +8,20 @@ class Form::Lettings::Questions::Layear < ::Form::Question end def answer_options - if form.start_year_2024_or_later? + if form.start_year_2025_or_later? + { + "1" => { "value" => "Just moved to local authority area with this new let" }, + "2" => { "value" => "Under 1 year" }, + "7" => { "value" => "1 year but under 2 years" }, + "8" => { "value" => "2 years but under 3 years" }, + "9" => { "value" => "3 years but under 4 years" }, + "10" => { "value" => "4 years but under 5 years" }, + "11" => { "value" => "5 years but under 10 years" }, + "12" => { "value" => "10 years or more" }, + "divider" => { "value" => true }, + "6" => { "value" => "Don’t know" }, + } + elsif form.start_year_2024_or_later? { "1" => { "value" => "Just moved to local authority area with this new let" }, "2" => { "value" => "Less than 1 year" }, diff --git a/app/models/form/lettings/questions/waityear.rb b/app/models/form/lettings/questions/waityear.rb index a6317918c..8745bf227 100644 --- a/app/models/form/lettings/questions/waityear.rb +++ b/app/models/form/lettings/questions/waityear.rb @@ -8,25 +8,10 @@ class Form::Lettings::Questions::Waityear < ::Form::Question end def answer_options - if form.start_year_2026_or_later? - return { - "13" => { "value" => "Household not on the housing register (or waiting list) in this area" }, - "2" => { "value" => "Under 1 year" }, - "7" => { "value" => "1 year but under 2 years" }, - "8" => { "value" => "2 years but under 3 years" }, - "9" => { "value" => "3 years but under 4 years" }, - "10" => { "value" => "4 years but under 5 years" }, - "11" => { "value" => "5 years but under 10 years" }, - "12" => { "value" => "10 years or more" }, - "divider" => { "value" => true }, - "6" => { "value" => "Don’t know" }, - }.freeze - end - if form.start_year_2025_or_later? return { "13" => { "value" => "Household not on the housing register (or waiting list) in this area" }, - "2" => { "value" => "Less than 1 year" }, + "2" => { "value" => "Under 1 year" }, "7" => { "value" => "1 year but under 2 years" }, "8" => { "value" => "2 years but under 3 years" }, "9" => { "value" => "3 years but under 4 years" }, diff --git a/spec/models/form/lettings/questions/layear_spec.rb b/spec/models/form/lettings/questions/layear_spec.rb index 5ea537514..b7023c711 100644 --- a/spec/models/form/lettings/questions/layear_spec.rb +++ b/spec/models/form/lettings/questions/layear_spec.rb @@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::Layear, type: :model do let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) } before do - allow(form).to receive(:start_year_2024_or_later?).and_return(false) + allow(form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false) allow(page).to receive(:subsection).and_return(subsection) allow(subsection).to receive(:form).and_return(form) end @@ -68,6 +68,27 @@ RSpec.describe Form::Lettings::Questions::Layear, type: :model do end end + context "with 2025/26 form" do + before do + allow(form).to receive(:start_year_2025_or_later?).and_return(true) + end + + it "has the correct answer_options" do + expect(question.answer_options).to eq({ + "1" => { "value" => "Just moved to local authority area with this new let" }, + "2" => { "value" => "Under 1 year" }, + "7" => { "value" => "1 year but under 2 years" }, + "8" => { "value" => "2 years but under 3 years" }, + "9" => { "value" => "3 years but under 4 years" }, + "10" => { "value" => "4 years but under 5 years" }, + "11" => { "value" => "5 years but under 10 years" }, + "12" => { "value" => "10 years or more" }, + "divider" => { "value" => true }, + "6" => { "value" => "Don’t know" }, + }) + end + end + it "has the correct check_answers_card_number" do expect(question.check_answers_card_number).to eq(0) end diff --git a/spec/models/form/lettings/questions/waityear_spec.rb b/spec/models/form/lettings/questions/waityear_spec.rb index 3ce672ec0..9ebf8dec1 100644 --- a/spec/models/form/lettings/questions/waityear_spec.rb +++ b/spec/models/form/lettings/questions/waityear_spec.rb @@ -82,27 +82,6 @@ RSpec.describe Form::Lettings::Questions::Waityear, type: :model do allow(form).to receive(:start_year_2025_or_later?).and_return(true) end - it "has the correct answer_options" do - expect(question.answer_options).to eq({ - "13" => { "value" => "Household not on the housing register (or waiting list) in this area" }, - "2" => { "value" => "Less than 1 year" }, - "7" => { "value" => "1 year but under 2 years" }, - "8" => { "value" => "2 years but under 3 years" }, - "9" => { "value" => "3 years but under 4 years" }, - "10" => { "value" => "4 years but under 5 years" }, - "11" => { "value" => "5 years but under 10 years" }, - "12" => { "value" => "10 years or more" }, - "divider" => { "value" => true }, - "6" => { "value" => "Don’t know" }, - }) - end - end - - context "with 2026/27 form" do - before do - allow(form).to receive(:start_year_2026_or_later?).and_return(true) - end - it "has the correct answer_options" do expect(question.answer_options).to eq({ "13" => { "value" => "Household not on the housing register (or waiting list) in this area" },