From 520b41016e48739e8824defe145ac00d43f21659 Mon Sep 17 00:00:00 2001 From: Nat Dean-Lewis Date: Mon, 9 Mar 2026 09:50:44 +0000 Subject: [PATCH] CLDC-4248: less than > under in waityear responses --- .../form/lettings/questions/waityear.rb | 15 +++++++++++++ .../form/lettings/questions/waityear_spec.rb | 21 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/app/models/form/lettings/questions/waityear.rb b/app/models/form/lettings/questions/waityear.rb index 7e0f2b77e..a6317918c 100644 --- a/app/models/form/lettings/questions/waityear.rb +++ b/app/models/form/lettings/questions/waityear.rb @@ -8,6 +8,21 @@ 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" }, diff --git a/spec/models/form/lettings/questions/waityear_spec.rb b/spec/models/form/lettings/questions/waityear_spec.rb index cf5cd746f..3ce672ec0 100644 --- a/spec/models/form/lettings/questions/waityear_spec.rb +++ b/spec/models/form/lettings/questions/waityear_spec.rb @@ -97,4 +97,25 @@ RSpec.describe Form::Lettings::Questions::Waityear, type: :model do }) 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" }, + "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 end