From 97a4be3c9a02d1f28736f1ee4ea93f33c80c961f Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 14 Dec 2022 11:00:44 +0000 Subject: [PATCH] Add person1 working situation question --- .../sales/pages/person1_working_situation.rb | 18 +++++++ ...erson1_working_situation_joint_purchase.rb | 18 +++++++ .../questions/person1_working_situation.rb | 25 +++++++++ .../subsections/household_characteristics.rb | 2 + ...1_working_situation_joint_purchase_spec.rb | 33 ++++++++++++ .../pages/person1_working_situation_spec.rb | 33 ++++++++++++ .../person1_working_situation_spec.rb | 53 +++++++++++++++++++ .../household_characteristics_spec.rb | 2 + spec/models/form_handler_spec.rb | 4 +- 9 files changed, 186 insertions(+), 2 deletions(-) create mode 100644 app/models/form/sales/pages/person1_working_situation.rb create mode 100644 app/models/form/sales/pages/person1_working_situation_joint_purchase.rb create mode 100644 app/models/form/sales/questions/person1_working_situation.rb create mode 100644 spec/models/form/sales/pages/person1_working_situation_joint_purchase_spec.rb create mode 100644 spec/models/form/sales/pages/person1_working_situation_spec.rb create mode 100644 spec/models/form/sales/questions/person1_working_situation_spec.rb diff --git a/app/models/form/sales/pages/person1_working_situation.rb b/app/models/form/sales/pages/person1_working_situation.rb new file mode 100644 index 000000000..e9d6df7fa --- /dev/null +++ b/app/models/form/sales/pages/person1_working_situation.rb @@ -0,0 +1,18 @@ +class Form::Sales::Pages::Person1WorkingSituation < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "person_1_working_situation" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [ + { "details_known_1" => 1, "jointpur" => 2 }, + ] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Person1WorkingSituation.new("ecstat2", nil, self), + ] + end +end diff --git a/app/models/form/sales/pages/person1_working_situation_joint_purchase.rb b/app/models/form/sales/pages/person1_working_situation_joint_purchase.rb new file mode 100644 index 000000000..80ea9d3b8 --- /dev/null +++ b/app/models/form/sales/pages/person1_working_situation_joint_purchase.rb @@ -0,0 +1,18 @@ +class Form::Sales::Pages::Person1WorkingSituationJointPurchase < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "person_1_working_situation_joint_purchase" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [ + { "details_known_1" => 1, "jointpur" => 1 }, + ] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Person1WorkingSituation.new("ecstat3", nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/person1_working_situation.rb b/app/models/form/sales/questions/person1_working_situation.rb new file mode 100644 index 000000000..56a9f26fe --- /dev/null +++ b/app/models/form/sales/questions/person1_working_situation.rb @@ -0,0 +1,25 @@ +class Form::Sales::Questions::Person1WorkingSituation < ::Form::Question + def initialize(id, hsh, page) + super + @check_answer_label = "Person 1’s working situation" + @header = "Which of these best describes Person 1’s working situation?" + @type = "radio" + @page = page + @answer_options = ANSWER_OPTIONS + @check_answers_card_number = id == "ecstat2" ? 2 : 3 + end + + ANSWER_OPTIONS = { + "2" => { "value" => "Part-time - Less than 30 hours" }, + "1" => { "value" => "Full-time - 30 hours or more" }, + "3" => { "value" => "In government training into work, such as New Deal" }, + "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" }, + "9" => { "value" => "Child under 16" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 187d7c108..8c8705467 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -33,6 +33,8 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::Person1Age.new(nil, nil, self), Form::Sales::Pages::Person1GenderIdentity.new(nil, nil, self), Form::Sales::Pages::Person1GenderIdentityJointPurchase.new(nil, nil, self), + Form::Sales::Pages::Person1WorkingSituation.new(nil, nil, self), + Form::Sales::Pages::Person1WorkingSituationJointPurchase.new(nil, nil, self), Form::Sales::Pages::Person2Known.new(nil, nil, self), Form::Sales::Pages::Person2Age.new(nil, nil, self), Form::Sales::Pages::Person3Known.new(nil, nil, self), diff --git a/spec/models/form/sales/pages/person1_working_situation_joint_purchase_spec.rb b/spec/models/form/sales/pages/person1_working_situation_joint_purchase_spec.rb new file mode 100644 index 000000000..e5604968e --- /dev/null +++ b/spec/models/form/sales/pages/person1_working_situation_joint_purchase_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Person1WorkingSituationJointPurchase, type: :model do + subject(:page) { described_class.new(page_id, page_definition, subsection) } + + let(:page_id) { nil } + let(:page_definition) { nil } + let(:subsection) { instance_double(Form::Subsection) } + + it "has correct subsection" do + expect(page.subsection).to eq(subsection) + end + + it "has correct questions" do + expect(page.questions.map(&:id)).to eq(%w[ecstat3]) + end + + it "has the correct id" do + expect(page.id).to eq("person_1_working_situation_joint_purchase") + end + + it "has the correct header" do + expect(page.header).to eq("") + end + + it "has the correct description" do + expect(page.description).to eq("") + end + + it "has correct depends_on" do + expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 1 }]) + end +end diff --git a/spec/models/form/sales/pages/person1_working_situation_spec.rb b/spec/models/form/sales/pages/person1_working_situation_spec.rb new file mode 100644 index 000000000..fd0b3805c --- /dev/null +++ b/spec/models/form/sales/pages/person1_working_situation_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Person1WorkingSituation, type: :model do + subject(:page) { described_class.new(page_id, page_definition, subsection) } + + let(:page_id) { nil } + let(:page_definition) { nil } + let(:subsection) { instance_double(Form::Subsection) } + + it "has correct subsection" do + expect(page.subsection).to eq(subsection) + end + + it "has correct questions" do + expect(page.questions.map(&:id)).to eq(%w[ecstat2]) + end + + it "has the correct id" do + expect(page.id).to eq("person_1_working_situation") + end + + it "has the correct header" do + expect(page.header).to eq("") + end + + it "has the correct description" do + expect(page.description).to eq("") + end + + it "has correct depends_on" do + expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 2 }]) + end +end diff --git a/spec/models/form/sales/questions/person1_working_situation_spec.rb b/spec/models/form/sales/questions/person1_working_situation_spec.rb new file mode 100644 index 000000000..f5eaff1a4 --- /dev/null +++ b/spec/models/form/sales/questions/person1_working_situation_spec.rb @@ -0,0 +1,53 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Person1WorkingSituation, type: :model do + subject(:question) { described_class.new(question_id, question_definition, page) } + + let(:question_id) { "ecstat2" } + let(:question_definition) { nil } + let(:page) { instance_double(Form::Page) } + + it "has correct page" do + expect(question.page).to eq(page) + end + + it "has the correct id" do + expect(question.id).to eq("ecstat2") + end + + it "has the correct header" do + expect(question.header).to eq("Which of these best describes Person 1’s working situation?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Person 1’s working situation") + end + + it "has the correct type" do + expect(question.type).to eq("radio") + end + + it "is not marked as derived" do + expect(question.derived?).to be false + end + + it "has expected check answers card number" do + expect(question.check_answers_card_number).to eq(2) + end + + it "has the correct answer_options" do + expect(question.answer_options).to eq({ + "2" => { "value" => "Part-time - Less than 30 hours" }, + "1" => { "value" => "Full-time - 30 hours or more" }, + "3" => { "value" => "In government training into work, such as New Deal" }, + "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" }, + "9" => { "value" => "Child under 16" }, + }) + end +end diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index ce464383f..cebf7a06c 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -38,6 +38,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model person_1_age person_1_gender_identity person_1_gender_identity_joint_purchase + person_1_working_situation + person_1_working_situation_joint_purchase person_2_known person_2_age person_3_known diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 7656fe7fb..f8a1d04f6 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,14 @@ RSpec.describe FormHandler do it "is able to load a current sales form" do form = form_handler.get_form("current_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(56) + expect(form.pages.count).to eq(58) expect(form.name).to eq("2022_2023_sales") end it "is able to load a previous sales form" do form = form_handler.get_form("previous_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(56) + expect(form.pages.count).to eq(58) expect(form.name).to eq("2021_2022_sales") end end