From d2db2db36624e17a0bb4a494e0bdb2e01cc61c1e Mon Sep 17 00:00:00 2001 From: Jack S Date: Thu, 6 Apr 2023 17:02:37 +0100 Subject: [PATCH] Update copy and methods --- app/models/validations/household_validations.rb | 2 +- spec/models/validations/household_validations_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index 41203a2f0..47d094be8 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -121,7 +121,7 @@ module Validations::HouseholdValidations end end - def validate_housing_needs(record) + def validate_combination_of_housing_needs_responses(record) if record.housingneeds == 1 && record.housingneeds_type == 3 && record.housingneeds_other&.zero? record.errors.add :housingneeds, I18n.t("validations.household.housingneeds.invalid") record.errors.add :housingneeds_type, I18n.t("validations.household.housingneeds.invalid") diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb index 23f4ca4a2..b1c01b7a5 100644 --- a/spec/models/validations/household_validations_spec.rb +++ b/spec/models/validations/household_validations_spec.rb @@ -639,12 +639,12 @@ RSpec.describe Validations::HouseholdValidations do end describe "housing needs validations" do - it "is invalid when housingneeds == 1 && housingneeds_type == 3 && housingneeds_other == 0" do + it "is invalid when a combination of housingneeds == 1 (yes) && housingneeds_type == 3 (none of listed) && housingneeds_other == 0 (no)" do record.housingneeds = 1 record.housingneeds_type = 3 record.housingneeds_other = 0 - household_validator.validate_housing_needs(record) + household_validator.validate_combination_of_housing_needs_responses(record) error_message = ["If somebody in the household has disabled access needs, they must have the access needs listed, or other access needs"]