From ae17cf958aad801493516fcfda4dbc972a8c3c3d Mon Sep 17 00:00:00 2001 From: samyou-softwire Date: Thu, 19 Feb 2026 15:21:01 +0000 Subject: [PATCH] fixup! CLDC-4143: Add new gender age retirement soft validation update subsection specs --- .../household_characteristics_spec.rb | 51 +++++++------------ .../subsections/household_needs_spec.rb | 3 +- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/spec/models/form/lettings/subsections/household_characteristics_spec.rb b/spec/models/form/lettings/subsections/household_characteristics_spec.rb index 11df2b8d7..c33d271c5 100644 --- a/spec/models/form/lettings/subsections/household_characteristics_spec.rb +++ b/spec/models/form/lettings/subsections/household_characteristics_spec.rb @@ -339,18 +339,15 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod expect(household_characteristics.pages.map(&:id)).to eq( %w[ household_members - no_females_pregnant_household_lead_hhmemb_value_check - females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check + no_household_member_likely_to_be_pregnant_hhmemb_check lead_tenant_age - no_females_pregnant_household_lead_age_value_check - females_in_soft_age_range_in_pregnant_household_lead_age_value_check + no_household_member_likely_to_be_pregnant_lead_age_check age_lead_tenant_under_retirement_value_check age_lead_tenant_over_retirement_value_check lead_tenant_sex_registered_at_birth lead_tenant_gender_same_as_sex lead_tenant_gender_identity - no_females_pregnant_household_lead_value_check - females_in_soft_age_range_in_pregnant_household_lead_value_check + no_household_member_likely_to_be_pregnant_lead_check gender_lead_tenant_over_retirement_value_check lead_tenant_ethnic_group lead_tenant_ethnic_background_arab @@ -367,15 +364,13 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod person_2_age person_2_lead_partner relationship_2_multiple_partners_value_check - no_females_pregnant_household_person_2_age_value_check - females_in_soft_age_range_in_pregnant_household_person_2_age_value_check + no_household_member_likely_to_be_pregnant_person_age_2_check age_2_under_retirement_value_check age_2_over_retirement_value_check person_2_sex_registered_at_birth person_2_gender_same_as_sex person_2_gender_identity - no_females_pregnant_household_person_2_value_check - females_in_soft_age_range_in_pregnant_household_person_2_value_check + no_household_member_likely_to_be_pregnant_person_2_check gender_2_over_retirement_value_check person_2_working_situation working_situation_2_under_retirement_value_check @@ -385,15 +380,13 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod person_3_age person_3_lead_partner relationship_3_multiple_partners_value_check - no_females_pregnant_household_person_3_age_value_check - females_in_soft_age_range_in_pregnant_household_person_3_age_value_check + no_household_member_likely_to_be_pregnant_person_age_3_check age_3_under_retirement_value_check age_3_over_retirement_value_check person_3_sex_registered_at_birth person_3_gender_same_as_sex person_3_gender_identity - no_females_pregnant_household_person_3_value_check - females_in_soft_age_range_in_pregnant_household_person_3_value_check + no_household_member_likely_to_be_pregnant_person_3_check gender_3_over_retirement_value_check person_3_working_situation working_situation_3_under_retirement_value_check @@ -403,15 +396,13 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod person_4_age person_4_lead_partner relationship_4_multiple_partners_value_check - no_females_pregnant_household_person_4_age_value_check - females_in_soft_age_range_in_pregnant_household_person_4_age_value_check + no_household_member_likely_to_be_pregnant_person_age_4_check age_4_under_retirement_value_check age_4_over_retirement_value_check person_4_sex_registered_at_birth person_4_gender_same_as_sex person_4_gender_identity - no_females_pregnant_household_person_4_value_check - females_in_soft_age_range_in_pregnant_household_person_4_value_check + no_household_member_likely_to_be_pregnant_person_4_check gender_4_over_retirement_value_check person_4_working_situation working_situation_4_under_retirement_value_check @@ -421,15 +412,13 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod person_5_age person_5_lead_partner relationship_5_multiple_partners_value_check - no_females_pregnant_household_person_5_age_value_check - females_in_soft_age_range_in_pregnant_household_person_5_age_value_check + no_household_member_likely_to_be_pregnant_person_age_5_check age_5_under_retirement_value_check age_5_over_retirement_value_check person_5_sex_registered_at_birth person_5_gender_same_as_sex person_5_gender_identity - no_females_pregnant_household_person_5_value_check - females_in_soft_age_range_in_pregnant_household_person_5_value_check + no_household_member_likely_to_be_pregnant_person_5_check gender_5_over_retirement_value_check person_5_working_situation working_situation_5_under_retirement_value_check @@ -439,15 +428,13 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod person_6_age person_6_lead_partner relationship_6_multiple_partners_value_check - no_females_pregnant_household_person_6_age_value_check - females_in_soft_age_range_in_pregnant_household_person_6_age_value_check + no_household_member_likely_to_be_pregnant_person_age_6_check age_6_under_retirement_value_check age_6_over_retirement_value_check person_6_sex_registered_at_birth person_6_gender_same_as_sex person_6_gender_identity - no_females_pregnant_household_person_6_value_check - females_in_soft_age_range_in_pregnant_household_person_6_value_check + no_household_member_likely_to_be_pregnant_person_6_check gender_6_over_retirement_value_check person_6_working_situation working_situation_6_under_retirement_value_check @@ -457,15 +444,13 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod person_7_age person_7_lead_partner relationship_7_multiple_partners_value_check - no_females_pregnant_household_person_7_age_value_check - females_in_soft_age_range_in_pregnant_household_person_7_age_value_check + no_household_member_likely_to_be_pregnant_person_age_7_check age_7_under_retirement_value_check age_7_over_retirement_value_check person_7_sex_registered_at_birth person_7_gender_same_as_sex person_7_gender_identity - no_females_pregnant_household_person_7_value_check - females_in_soft_age_range_in_pregnant_household_person_7_value_check + no_household_member_likely_to_be_pregnant_person_7_check gender_7_over_retirement_value_check person_7_working_situation working_situation_7_under_retirement_value_check @@ -475,15 +460,13 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod person_8_age person_8_lead_partner relationship_8_multiple_partners_value_check - no_females_pregnant_household_person_8_age_value_check - females_in_soft_age_range_in_pregnant_household_person_8_age_value_check + no_household_member_likely_to_be_pregnant_person_age_8_check age_8_under_retirement_value_check age_8_over_retirement_value_check person_8_sex_registered_at_birth person_8_gender_same_as_sex person_8_gender_identity - no_females_pregnant_household_person_8_value_check - females_in_soft_age_range_in_pregnant_household_person_8_value_check + no_household_member_likely_to_be_pregnant_person_8_check gender_8_over_retirement_value_check person_8_working_situation working_situation_8_under_retirement_value_check diff --git a/spec/models/form/lettings/subsections/household_needs_spec.rb b/spec/models/form/lettings/subsections/household_needs_spec.rb index 7c3a2a505..01423f8dd 100644 --- a/spec/models/form/lettings/subsections/household_needs_spec.rb +++ b/spec/models/form/lettings/subsections/household_needs_spec.rb @@ -53,8 +53,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdNeeds, type: :model do armed_forces_serving armed_forces_injured pregnant - no_females_pregnant_household_value_check - females_in_soft_age_range_in_pregnant_household_value_check + no_household_member_likely_to_be_pregnant_check access_needs_exist type_of_access_needs health_conditions