From 6b4429d50211df4e743b5cb2d10844dfc48f7be2 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 24 Feb 2022 09:27:25 +0000 Subject: [PATCH] content changes and prevloc validation --- app/models/validations/household_validations.rb | 6 ++++++ config/forms/2021_2022.json | 2 +- config/locales/en.yml | 1 + spec/models/validations/household_validations_spec.rb | 11 +++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index 58997fb9d..5fdeb8e40 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -90,6 +90,12 @@ module Validations::HouseholdValidations end end + def validate_prevloc(record) + if record.previous_la_known == "Yes" && record.prevloc.blank? + record.errors.add :prevloc, I18n.t("validations.household.previous_la_known") + end + end + private def women_of_child_bearing_age_in_household(record) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index cd1562545..ede49b9eb 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -2687,7 +2687,7 @@ "description": "", "questions": { "previous_postcode_known": { - "header": "Do you know the property’s postcode?", + "header": "Do you know the postcode of the household’s last settled accommodation?", "hint_text": "This is also known as the household’s ’last settled home’.", "type": "radio", "answer_options": { diff --git a/config/locales/en.yml b/config/locales/en.yml index f391010f6..9a5b8fad9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -126,6 +126,7 @@ en: 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" + previous_la_known: "Enter a local authority" tenancy: diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb index 423b9c412..50243321f 100644 --- a/spec/models/validations/household_validations_spec.rb +++ b/spec/models/validations/household_validations_spec.rb @@ -536,4 +536,15 @@ RSpec.describe Validations::HouseholdValidations do end end end + + describe "la validations" do + context "when previous la is known" do + it "prevloc has to be provided" do + record.previous_la_known = "Yes" + household_validator.validate_prevloc(record) + expect(record.errors["prevloc"]) + .to include(match I18n.t("validations.household.previous_la_known")) + end + end + end end