diff --git a/app/models/form/sales/questions/person.rb b/app/models/form/sales/questions/person.rb index bf62fe7f9..3c7f78214 100644 --- a/app/models/form/sales/questions/person.rb +++ b/app/models/form/sales/questions/person.rb @@ -15,5 +15,6 @@ class Form::Sales::Questions::Person < ::Form::Question def field_for_person(field, suffix = "") return [field, person_display_number, suffix].join if field == "details_known_" - [field, @person_index, suffix].join end + [field, @person_index, suffix].join + end end diff --git a/spec/models/form/sales/pages/person_age_spec.rb b/spec/models/form/sales/pages/person_age_spec.rb index 4c4159896..18fdf0c6e 100644 --- a/spec/models/form/sales/pages/person_age_spec.rb +++ b/spec/models/form/sales/pages/person_age_spec.rb @@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Pages::PersonAge, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq( - [{ "hholdcount" => 1, "jointpur" => 2 }, { "hholdcount" => 2, "jointpur" => 2 }, { "hholdcount" => 3, "jointpur" => 2 }, { "hholdcount" => 4, "jointpur" => 2 }], + [{"details_known_1"=>1, "jointpur"=>2}], ) end end @@ -119,7 +119,7 @@ RSpec.describe Form::Sales::Pages::PersonAge, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq( - [{ "hholdcount" => 1, "jointpur" => 1 }, { "hholdcount" => 2, "jointpur" => 1 }, { "hholdcount" => 3, "jointpur" => 1 }, { "hholdcount" => 4, "jointpur" => 1 }], + [{"details_known_1"=>1, "jointpur"=>1}], ) end end diff --git a/spec/models/form/sales/pages/person_known_spec.rb b/spec/models/form/sales/pages/person_known_spec.rb index faf4c5b1b..bb73d6b63 100644 --- a/spec/models/form/sales/pages/person_known_spec.rb +++ b/spec/models/form/sales/pages/person_known_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do let(:page_id) { "person_2_known" } let(:page_definition) { nil } let(:subsection) { instance_double(Form::Subsection) } - let(:person_index) { 1 } + let(:person_index) { 3 } it "has correct subsection" do expect(page.subsection).to eq(subsection) @@ -120,7 +120,7 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do let(:page_id) { "person_2_known" } let(:page_definition) { nil } let(:subsection) { instance_double(Form::Subsection) } - let(:person_index) { 1 } + let(:person_index) { 4 } it "has correct subsection" do expect(page.subsection).to eq(subsection) diff --git a/spec/models/form/sales/questions/person_known_spec.rb b/spec/models/form/sales/questions/person_known_spec.rb index 2c33346f0..2635b939d 100644 --- a/spec/models/form/sales/questions/person_known_spec.rb +++ b/spec/models/form/sales/questions/person_known_spec.rb @@ -6,7 +6,7 @@ RSpec.describe Form::Sales::Questions::PersonKnown, type: :model do let(:question_id) { "details_known_1" } let(:question_definition) { nil } let(:page) { instance_double(Form::Page) } - let(:person_index) { 1 } + let(:person_index) { 2 } it "has correct page" do expect(question.page).to eq(page) diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index 9c96ecb3a..ecdeca2dd 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -35,6 +35,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_2_live_in_property number_of_others_in_property person_1_known + person_1_known_joint_purchase person_1_relationship_to_buyer_1 person_1_relationship_to_buyer_1_joint_purchase person_1_age @@ -44,6 +45,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model person_1_working_situation person_1_working_situation_joint_purchase person_2_known + person_2_known_joint_purchase person_2_relationship_to_buyer_1 person_2_relationship_to_buyer_1_joint_purchase person_2_age @@ -51,6 +53,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model person_2_working_situation person_2_working_situation_joint_purchase person_3_known + person_3_known_joint_purchase person_3_relationship_to_buyer_1 person_3_relationship_to_buyer_1_joint_purchase person_3_age @@ -58,6 +61,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model person_3_working_situation person_3_working_situation_joint_purchase person_4_known + person_4_known_joint_purchase person_4_relationship_to_buyer_1 person_4_relationship_to_buyer_1_joint_purchase person_4_age diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 83e1aa582..4491094ec 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(116) + expect(form.pages.count).to eq(120) 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(116) + expect(form.pages.count).to eq(120) expect(form.name).to eq("2021_2022_sales") end end