diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index 9ff6cabc4..af6c0eeeb 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -41,13 +41,13 @@ FactoryBot.define do wheel { 1 } age3_known { 0 } age3 { 40 } - person2_known { 1 } + details_known_2 { 1 } age4_known { 0 } age4 { 40 } - person3_known { 1 } + details_known_3 { 1 } age5_known { 0 } age5 { 40 } - person4_known { 1 } + details_known_4 { 1 } age6_known { 0 } age6 { 40 } end diff --git a/spec/models/form/sales/pages/person2_age_spec.rb b/spec/models/form/sales/pages/person2_age_spec.rb index d24797b43..7ade29b65 100644 --- a/spec/models/form/sales/pages/person2_age_spec.rb +++ b/spec/models/form/sales/pages/person2_age_spec.rb @@ -29,11 +29,7 @@ RSpec.describe Form::Sales::Pages::Person2Age, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq( - [ - { "hholdcount" => 2 }, - { "hholdcount" => 3 }, - { "hholdcount" => 4 }, - ], + [{ "details_known_2" => 1, "hholdcount" => 2 }, { "details_known_2" => 1, "hholdcount" => 3 }, { "details_known_2" => 1, "hholdcount" => 4 }], ) end end diff --git a/spec/models/form/sales/pages/person3_age_spec.rb b/spec/models/form/sales/pages/person3_age_spec.rb index ca3a36c94..5089ae7ae 100644 --- a/spec/models/form/sales/pages/person3_age_spec.rb +++ b/spec/models/form/sales/pages/person3_age_spec.rb @@ -29,10 +29,7 @@ RSpec.describe Form::Sales::Pages::Person3Age, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq( - [ - { "hholdcount" => 3 }, - { "hholdcount" => 4 }, - ], + [{ "details_known_3" => 1, "hholdcount" => 3 }, { "details_known_3" => 1, "hholdcount" => 4 }], ) end end diff --git a/spec/models/form/sales/pages/person4_age_spec.rb b/spec/models/form/sales/pages/person4_age_spec.rb index cc61b3287..e8b331435 100644 --- a/spec/models/form/sales/pages/person4_age_spec.rb +++ b/spec/models/form/sales/pages/person4_age_spec.rb @@ -29,9 +29,7 @@ RSpec.describe Form::Sales::Pages::Person4Age, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq( - [ - { "hholdcount" => 4 }, - ], + [{ "details_known_4" => 1, "hholdcount" => 4 }], ) end end diff --git a/spec/models/form/sales/questions/person2_age_known_spec.rb b/spec/models/form/sales/questions/person2_age_known_spec.rb index e64db0dff..7ebee9dee 100644 --- a/spec/models/form/sales/questions/person2_age_known_spec.rb +++ b/spec/models/form/sales/questions/person2_age_known_spec.rb @@ -51,11 +51,7 @@ RSpec.describe Form::Sales::Questions::Person2AgeKnown, type: :model do it "has the correct hidden_in_check_answers" do expect(question.hidden_in_check_answers).to eq( { - "depends_on" => [ - { - "age4_known" => 0, - }, - ], + "depends_on" => [{ "age4_known" => 0 }, { "details_known_2" => nil }, { "details_known_2" => 2 }], }, ) end diff --git a/spec/models/form/sales/questions/person3_age_known_spec.rb b/spec/models/form/sales/questions/person3_age_known_spec.rb index 3b3ef6ff2..bb1762c88 100644 --- a/spec/models/form/sales/questions/person3_age_known_spec.rb +++ b/spec/models/form/sales/questions/person3_age_known_spec.rb @@ -51,11 +51,7 @@ RSpec.describe Form::Sales::Questions::Person3AgeKnown, type: :model do it "has the correct hidden_in_check_answers" do expect(question.hidden_in_check_answers).to eq( { - "depends_on" => [ - { - "age5_known" => 0, - }, - ], + "depends_on" => [{ "age5_known" => 0 }, { "details_known_3" => nil }, { "details_known_3" => 2 }], }, ) end diff --git a/spec/models/form/sales/questions/person4_age_known_spec.rb b/spec/models/form/sales/questions/person4_age_known_spec.rb index c72d92997..41a64cbea 100644 --- a/spec/models/form/sales/questions/person4_age_known_spec.rb +++ b/spec/models/form/sales/questions/person4_age_known_spec.rb @@ -51,11 +51,7 @@ RSpec.describe Form::Sales::Questions::Person4AgeKnown, type: :model do it "has the correct hidden_in_check_answers" do expect(question.hidden_in_check_answers).to eq( { - "depends_on" => [ - { - "age6_known" => 0, - }, - ], + "depends_on" => [{ "age6_known" => 0 }, { "details_known_4" => nil }, { "details_known_4" => 2 }], }, ) end diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index 1c0bdca86..dbe8a24a3 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -34,8 +34,11 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_2_live_in_property number_of_others_in_property person_1_age + person_2_known person_2_age + person_3_known person_3_age + person_4_known person_4_age ], ) diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 07390df41..814dd23a7 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -61,14 +61,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(39) + expect(form.pages.count).to eq(42) 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(39) + expect(form.pages.count).to eq(42) expect(form.name).to eq("2021_2022_sales") end end