From a19b6f4be1395cae024697daa4695edcf335c3d3 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 1 Feb 2024 13:51:14 +0000 Subject: [PATCH] feat: update buyer 2 as well --- .../buyer2_ethnic_background_white.rb | 25 +++++++++++----- .../buyer2_ethnic_background_white_spec.rb | 29 ++++++++++++++----- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_white.rb b/app/models/form/sales/questions/buyer2_ethnic_background_white.rb index 1500072e1..1c037d226 100644 --- a/app/models/form/sales/questions/buyer2_ethnic_background_white.rb +++ b/app/models/form/sales/questions/buyer2_ethnic_background_white.rb @@ -5,15 +5,26 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundWhite < ::Form::Question @check_answer_label = "Buyer 2’s ethnic background" @header = "Which of the following best describes buyer 2’s White background?" @type = "radio" - @answer_options = ANSWER_OPTIONS @check_answers_card_number = 2 @question_number = 31 end - ANSWER_OPTIONS = { - "1" => { "value" => "English, Welsh, Northern Irish, Scottish or British" }, - "2" => { "value" => "Irish" }, - "18" => { "value" => "Gypsy or Irish Traveller" }, - "3" => { "value" => "Any other White background" }, - }.freeze + def answer_options + if form.start_year_after_2024? + { + "1" => { "value" => "English, Welsh, Northern Irish, Scottish or British" }, + "2" => { "value" => "Irish" }, + "18" => { "value" => "Gypsy or Irish Traveller" }, + "20" => { "value" => "Roma" }, + "3" => { "value" => "Any other White background" }, + }.freeze + else + { + "1" => { "value" => "English, Welsh, Northern Irish, Scottish or British" }, + "2" => { "value" => "Irish" }, + "18" => { "value" => "Gypsy or Irish Traveller" }, + "3" => { "value" => "Any other White background" }, + }.freeze + end + end end diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb index d8aaa0292..dc7bec153 100644 --- a/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb +++ b/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb @@ -6,6 +6,14 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundWhite, type: :model let(:question_id) { nil } let(:question_definition) { nil } let(:page) { instance_double(Form::Page) } + let(:subsection) { instance_double(Form::Subsection) } + let(:form) { instance_double(Form) } + + before do + allow(form).to receive(:start_year_after_2024?).and_return(false) + allow(page).to receive(:subsection).and_return(subsection) + allow(subsection).to receive(:form).and_return(form) + end it "has correct page" do expect(question.page).to eq(page) @@ -35,13 +43,20 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundWhite, type: :model expect(question.hint_text).to be nil end - it "has the correct answer_options" do - expect(question.answer_options).to eq({ - "1" => { "value" => "English, Welsh, Northern Irish, Scottish or British" }, - "18" => { "value" => "Gypsy or Irish Traveller" }, - "2" => { "value" => "Irish" }, - "3" => { "value" => "Any other White background" }, - }) + context "with 2023/24 form" do + it "has the correct header" do + expect(question.header).to eq("Will the buyers live in the property?") + end + end + + context "with 2024/25 form" do + before do + allow(form).to receive(:start_year_after_2024?).and_return(true) + end + + it "has the correct header" do + expect(question.header).to eq("Will any buyers live in the property?") + end end it "has the correct check_answers_card_number" do