diff --git a/app/models/form/sales/questions/buyer2_working_situation.rb b/app/models/form/sales/questions/buyer2_working_situation.rb index 47a289d39..2aac823e0 100644 --- a/app/models/form/sales/questions/buyer2_working_situation.rb +++ b/app/models/form/sales/questions/buyer2_working_situation.rb @@ -15,6 +15,10 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end + def displayed_answer_options(log, _user = nil) + answer_options.reject { |key, _| key == "9" } + end + def answer_options if form.start_year_2025_or_later? { @@ -26,15 +30,7 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question "6" => { "value" => "Not seeking work" }, "7" => { "value" => "Full-time student" }, "8" => { "value" => "Unable to work due to long term sick or disability" }, - "9" => { - "value" => "Child under 16", - "depends_on" => [ - { "saledate" => { "operator" => "<", "operand" => Time.zone.local(2024, 4, 1) } }, - { "age2_known" => 1 }, - { "age2_known" => nil }, - { "age2" => { "operator" => "<", "operand" => 16 } }, - ], - }, + "9" => { "value" => "Child under 16" }, "0" => { "value" => "Other" }, "10" => { "value" => "Buyer prefers not to say" }, }.freeze @@ -50,15 +46,7 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question "0" => { "value" => "Other" }, "10" => { "value" => "Buyer prefers not to say" }, "7" => { "value" => "Full-time student" }, - "9" => { - "value" => "Child under 16", - "depends_on" => [ - { "saledate" => { "operator" => "<", "operand" => Time.zone.local(2024, 4, 1) } }, - { "age2_known" => 1 }, - { "age2_known" => nil }, - { "age2" => { "operator" => "<", "operand" => 16 } }, - ], - }, + "9" => { "value" => "Child under 16" }, }.freeze end end diff --git a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb index d557c0953..c8ee349b6 100644 --- a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb +++ b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb @@ -36,15 +36,22 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do "0" => { "value" => "Other" }, "10" => { "value" => "Buyer prefers not to say" }, "7" => { "value" => "Full-time student" }, - "9" => { - "value" => "Child under 16", - "depends_on" => [ - { "saledate" => { "operator" => "<", "operand" => Time.zone.local(2024, 4, 1) } }, - { "age2_known" => 1 }, - { "age2_known" => nil }, - { "age2" => { "operator" => "<", "operand" => 16 } }, - ], - }, + "9" => { "value" => "Child under 16" }, + }) + end + + it "has the correct displayed_answer_options" do + expect(question.displayed_answer_options(nil)).to eq({ + "1" => { "value" => "Full-time - 30 hours or more" }, + "2" => { "value" => "Part-time - Less than 30 hours" }, + "3" => { "value" => "In government training into work" }, + "4" => { "value" => "Jobseeker" }, + "6" => { "value" => "Not seeking work" }, + "8" => { "value" => "Unable to work due to long term sick or disability" }, + "5" => { "value" => "Retired" }, + "0" => { "value" => "Other" }, + "10" => { "value" => "Buyer prefers not to say" }, + "7" => { "value" => "Full-time student" }, }) end @@ -54,6 +61,10 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do it "uses the old ordering for answer options" do expect(question.answer_options.keys).to eq(%w[1 2 3 4 6 8 5 0 10 7 9]) end + + it "uses the old ordering for displayed answer options" do + expect(question.displayed_answer_options(nil).keys).to eq(%w[1 2 3 4 6 8 5 0 10 7]) + end end context "with start year from 2025" do @@ -62,6 +73,10 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do it "uses the new ordering for answer options" do expect(question.answer_options.keys).to eq(%w[1 2 3 4 5 6 7 8 9 0 10]) end + + it "uses the new ordering for displayed answer options" do + expect(question.displayed_answer_options(nil).keys).to eq(%w[1 2 3 4 5 6 7 8 0 10]) + end end it "has the correct check_answers_card_number" do