From a040ede23739d3f6010e7c8816e1df1c7c1c7502 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 23 Feb 2022 09:27:39 +0000 Subject: [PATCH] add a different error message for homeless validation --- app/models/validations/household_validations.rb | 2 +- config/locales/en.yml | 2 ++ spec/models/validations/household_validations_spec.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index 6dff1ac12..5b3d7c4d1 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -7,7 +7,7 @@ module Validations::HouseholdValidations def validate_reasonable_preference(record) if record.homeless == "No" && record.reasonpref == "Yes" record.errors.add :reasonpref, I18n.t("validations.household.reasonpref.not_homeless") - record.errors.add :homeless, I18n.t("validations.household.reasonpref.not_homeless") + record.errors.add :homeless, I18n.t("validations.household.homeless.reasonpref.not_homeless") elsif record.reasonpref == "No" if [record.rp_homeless, record.rp_insan_unsat, record.rp_medwel, record.rp_hardship, record.rp_dontknow].any? { |a| a == "Yes" } record.errors.add :reasonable_preference_reason, I18n.t("validations.household.reasonable_preference_reason.reason_not_required") diff --git a/config/locales/en.yml b/config/locales/en.yml index b18747985..c67daa54b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -121,6 +121,8 @@ en: internal_transfer: "Answer cannot be assessed as homeless as you already told us this tenancy is an internal transfer" other: internal_transfer: "Answer cannot be other homelessness as you already told us this tenancy was an internal transfer" + reasonpref: + not_homeless: "Can not be No if household was given reasonable preference" tenancy: diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb index 6d588ff4f..801fea796 100644 --- a/spec/models/validations/household_validations_spec.rb +++ b/spec/models/validations/household_validations_spec.rb @@ -72,7 +72,7 @@ RSpec.describe Validations::HouseholdValidations do expect(record.errors["reasonpref"]) .to include(match I18n.t("validations.household.reasonpref.not_homeless")) expect(record.errors["homeless"]) - .to include(match I18n.t("validations.household.reasonpref.not_homeless")) + .to include(match I18n.t("validations.household.homeless.reasonpref.not_homeless")) end end