From d9f2bcd8c0d2da7501b3f42ed53f254e8170eecd Mon Sep 17 00:00:00 2001 From: Arthur Campbell Date: Tue, 21 Feb 2023 16:04:51 +0000 Subject: [PATCH] fix merge conflicts --- .../sales/subsections/household_characteristics_spec.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index 578922c27..33e9a1409 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -46,7 +46,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_2_gender_identity gender_2_buyer_retirement_value_check buyer_2_working_situation - working_situation_2_buyer_retirement_value_check + working_situation_2_retirement_value_check_joint_purchase + working_situation_buyer_2_income_value_check buyer_2_live_in_property number_of_others_in_property person_2_known @@ -56,8 +57,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model person_2_gender_identity gender_2_retirement_value_check person_2_working_situation - working_situation_2_retirement_value_check_joint_purchase - working_situation_buyer_2_income_value_check + working_situation_2_retirement_value_check person_3_known person_3_relationship_to_buyer_1 person_3_age @@ -127,7 +127,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_2_ethnic_background_mixed buyer_2_ethnic_background_white buyer_2_working_situation - working_situation_2_buyer_retirement_value_check + working_situation_2_retirement_value_check_joint_purchase + working_situation_buyer_2_income_value_check buyer_2_live_in_property number_of_others_in_property person_2_known