Fix depends on, show retirement validation for buyer 2

app/models/form/sales/pages/person_known.rb

@@ -12,6 +12,6 @@ class Form::Sales::Pages::PersonKnown < Form::Sales::Pages::Person
   end
 
   def depends_on
-    { "jointpur" => 2 } if @person_index == 2
+    [{ "jointpur" => 2 }] if @person_index == 2
   end
 end

app/models/form/sales/subsections/household_characteristics.rb

@@ -29,8 +29,11 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self),
       Form::Sales::Pages::Age2.new(nil, nil, self),
       Form::Sales::Pages::OldPersonsSharedOwnershipValueCheck.new("age_2_old_persons_shared_ownership_value_check", nil, self),
+      Form::Sales::Pages::RetirementValueCheck.new("age_2_buyer_retirement_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::GenderIdentity2.new(nil, nil, self),
+      Form::Sales::Pages::RetirementValueCheck.new("gender_2_buyer_retirement_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self),
+      Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_buyer_retirement_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self),
       Form::Sales::Pages::PersonKnown.new("person_2_known", nil, self, person_index: 2),
@@ -40,6 +43,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::PersonGenderIdentity.new("person_2_gender_identity", nil, self, person_index: 2),
       Form::Sales::Pages::RetirementValueCheck.new("gender_2_retirement_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation", nil, self, person_index: 2),
+      Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_retirement_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::PersonKnown.new("person_3_known", nil, self, person_index: 3),
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_3_relationship_to_buyer_1", nil, self, person_index: 3),
       Form::Sales::Pages::PersonAge.new("person_3_age", nil, self, person_index: 3),

spec/models/form/sales/pages/person_known_spec.rb

@@ -38,11 +38,7 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
       end
 
       it "has correct depends_on" do
-        expect(page.depends_on).to eq(
-          [
-            { "hhmemb" => 2, "jointpur" => 2 }, { "hhmemb" => 3, "jointpur" => 2 }, { "hhmemb" => 4, "jointpur" => 2 }, { "hhmemb" => 5, "jointpur" => 2 }, { "hhmemb" => 6, "jointpur" => 2 }
-          ],
-        )
+        expect(page.depends_on).to eq([{ "jointpur" => 2 }])
       end
     end
 
@@ -63,9 +59,7 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
       end
 
       it "has correct depends_on" do
-        expect(page.depends_on).to eq(
-          [{ "hhmemb" => 3 }, { "hhmemb" => 4 }, { "hhmemb" => 5 }, { "hhmemb" => 6 }],
-        )
+        expect(page.depends_on).to be nil
       end
     end
 
@@ -86,9 +80,7 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
       end
 
       it "has correct depends_on" do
-        expect(page.depends_on).to eq(
-          [{ "hhmemb" => 4 }, { "hhmemb" => 5 }, { "hhmemb" => 6 }],
-        )
+        expect(page.depends_on).to be nil
       end
     end
 
@@ -109,9 +101,7 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
       end
 
       it "has correct depends_on" do
-        expect(page.depends_on).to eq(
-          [{ "hhmemb" => 5 }, { "hhmemb" => 6 }],
-        )
+        expect(page.depends_on).to be nil
       end
     end
   end