From ca939f345dc6d69aa3b2f74c66e993329de391f1 Mon Sep 17 00:00:00 2001 From: Jack S Date: Wed, 28 Dec 2022 11:05:16 +0000 Subject: [PATCH] wip --- .../sales/pages/buyer1_previous_tenure.rb | 15 ++++++ .../sales/questions/buyer1_previous_tenure.rb | 23 ++++++++++ .../sales/subsections/household_situation.rb | 1 + .../pages/buyer1_previous_tenure_spec.rb | 25 ++++++++++ .../questions/buyer1_previous_tenure_spec.rb | 46 +++++++++++++++++++ .../subsections/household_situation_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 7 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 app/models/form/sales/pages/buyer1_previous_tenure.rb create mode 100644 app/models/form/sales/questions/buyer1_previous_tenure.rb create mode 100644 spec/models/form/sales/pages/buyer1_previous_tenure_spec.rb create mode 100644 spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb diff --git a/app/models/form/sales/pages/buyer1_previous_tenure.rb b/app/models/form/sales/pages/buyer1_previous_tenure.rb new file mode 100644 index 000000000..1379fbd30 --- /dev/null +++ b/app/models/form/sales/pages/buyer1_previous_tenure.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::Buyer1PreviousTenure < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer1_previous_tenure" + @header = "What was buyer 1's previous tenure?" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::Buyer1PreviousTenure.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer1_previous_tenure.rb b/app/models/form/sales/questions/buyer1_previous_tenure.rb new file mode 100644 index 000000000..48bcc48b1 --- /dev/null +++ b/app/models/form/sales/questions/buyer1_previous_tenure.rb @@ -0,0 +1,23 @@ +class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question + def initialize(id, hsh, page) + super + @id = "prevten" + @check_answer_label = "Buyer 1's previous tenure" + @header = "What was buyer 1's previous tenure?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + # @check_answers_card_number = 1 + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Local Authority" }, + "2" => { "value" => "Private registered provider or housing association tenant" }, + "3" => { "value" => "Private tenant" }, + "5" => { "value" => "Owner occupier" }, + "4" => { "value" => "Tied home or renting with job" }, + "6" => { "value" => "Living with family or friends" }, + "7" => { "value" => "Temporary accomodation" }, + "9" => { "value" => "Other" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_situation.rb b/app/models/form/sales/subsections/household_situation.rb index 45a12a2a0..09317dca6 100644 --- a/app/models/form/sales/subsections/household_situation.rb +++ b/app/models/form/sales/subsections/household_situation.rb @@ -11,6 +11,7 @@ class Form::Sales::Subsections::HouseholdSituation < ::Form::Subsection @pages ||= [ Form::Sales::Pages::BuyersOrganisations.new(nil, nil, self), Form::Sales::Pages::LastAccommodation.new(nil, nil, self), + Form::Sales::Pages::Buyer1PreviousTenure.new(nil, nil, self), ] end end diff --git a/spec/models/form/sales/pages/buyer1_previous_tenure_spec.rb b/spec/models/form/sales/pages/buyer1_previous_tenure_spec.rb new file mode 100644 index 000000000..f48c95d83 --- /dev/null +++ b/spec/models/form/sales/pages/buyer1_previous_tenure_spec.rb @@ -0,0 +1,25 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Buyer1PreviousTenure, 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[prevten]) + end + + it "has the correct id" do + expect(page.id).to eq("buyers_organisations") + end + + it "has the correct header" do + expect(page.header).to eq("What was buyer 1's previous tenure?") + end +end diff --git a/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb b/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb new file mode 100644 index 000000000..ae1da940a --- /dev/null +++ b/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb @@ -0,0 +1,46 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Buyer1PreviousTenure, type: :model do + subject(:question) { described_class.new(question_id, question_definition, page) } + + let(:question_id) { nil } + 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("prevten") + end + + it "has the correct header" do + expect(question.header).to eq("What was buyer 1's previous tenure?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer 1's previous tenure") + 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 the correct answer_options" do + expect(question.answer_options).to eq({ + "1" => { "value" => "Local Authority" }, + "2" => { "value" => "Private registered provider or housing association tenant" }, + "3" => { "value" => "Private tenant" }, + "4" => { "value" => "Tied home or renting with job" }, + "5" => { "value" => "Owner occupier" }, + "6" => { "value" => "Living with family or friends" }, + "7" => { "value" => "Temporary accomodation" }, + "9" => { "value" => "Other" }, + }) + end +end diff --git a/spec/models/form/sales/subsections/household_situation_spec.rb b/spec/models/form/sales/subsections/household_situation_spec.rb index fefd60013..dea721d74 100644 --- a/spec/models/form/sales/subsections/household_situation_spec.rb +++ b/spec/models/form/sales/subsections/household_situation_spec.rb @@ -16,6 +16,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdSituation, type: :model do %w[ buyers_organisations last_accommodation + buyer1_previous_tenure ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 3ac4681ff..6b6c54629 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(74) + expect(form.pages.count).to eq(75) 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(74) + expect(form.pages.count).to eq(75) expect(form.name).to eq("2021_2022_sales") end end