Browse Source

change message displayed on hhmemb page

pull/549/head
Dushan Despotovic 4 years ago
parent
commit
9e7512ca5b
  1. 2
      app/models/validations/tenancy_validations.rb
  2. 2
      config/forms/2022_2023.json
  3. 2
      config/locales/en.yml
  4. 3
      spec/models/validations/tenancy_validations_spec.rb

2
app/models/validations/tenancy_validations.rb

@ -38,7 +38,7 @@ module Validations::TenancyValidations
if record.hhmemb == 1 && record.joint != 2 && record.collection_start_year >= 2022 if record.hhmemb == 1 && record.joint != 2 && record.collection_start_year >= 2022
record.errors.add :joint, I18n.t("validations.tenancy.not_joint") record.errors.add :joint, I18n.t("validations.tenancy.not_joint")
record.errors.add :hhmemb, I18n.t("validations.tenancy.not_joint") record.errors.add :hhmemb, I18n.t("validations.tenancy.joint_more_than_one_member")
end end
end end
end end

2
config/forms/2022_2023.json

@ -946,7 +946,7 @@
"header": "", "header": "",
"description": "", "description": "",
"questions": { "questions": {
"joint_tenancy": { "joint": {
"check_answer_label": "Is this a joint tenancy?", "check_answer_label": "Is this a joint tenancy?",
"header": "Is this a joint tenancy?", "header": "Is this a joint tenancy?",
"hint_text": "For example, 27 3 2021.", "hint_text": "For example, 27 3 2021.",

2
config/locales/en.yml

@ -222,6 +222,8 @@ en:
internal_transfer: "Answer must be secure tenancy as you already told us this tenancy is an internal transfer" internal_transfer: "Answer must be secure tenancy as you already told us this tenancy is an internal transfer"
cannot_be_internal_transfer: "Answer cannot be internal transfer as you already told us this is not a secure tenancy" cannot_be_internal_transfer: "Answer cannot be internal transfer as you already told us this is not a secure tenancy"
not_joint: "This cannot be a joint tenancy as you've told us there's only one person in the household" not_joint: "This cannot be a joint tenancy as you've told us there's only one person in the household"
joint_more_than_one_member: "There must be more than one person in the household as you've told us this is a joint tenancy"
declaration: declaration:
missing: "You must show the DLUHC privacy notice to the tenant before you can submit this log." missing: "You must show the DLUHC privacy notice to the tenant before you can submit this log."

3
spec/models/validations/tenancy_validations_spec.rb

@ -151,13 +151,14 @@ RSpec.describe Validations::TenancyValidations do
context "when the data inputter has said that there is only one member in the household" do context "when the data inputter has said that there is only one member in the household" do
let(:record) { FactoryBot.create(:case_log, startdate: Time.zone.local(2022, 5, 1)) } let(:record) { FactoryBot.create(:case_log, startdate: Time.zone.local(2022, 5, 1)) }
let(:expected_error) { I18n.t("validations.tenancy.not_joint") } let(:expected_error) { I18n.t("validations.tenancy.not_joint") }
let(:hhmemb_expected_error) { I18n.t("validations.tenancy.joint_more_than_one_member") }
it "displays an error if the data inputter says the letting is a joint tenancy" do it "displays an error if the data inputter says the letting is a joint tenancy" do
record.hhmemb = 1 record.hhmemb = 1
record.joint = 1 record.joint = 1
tenancy_validator.validate_joint_tenancy(record) tenancy_validator.validate_joint_tenancy(record)
expect(record.errors["joint"]).to include(match(expected_error)) expect(record.errors["joint"]).to include(match(expected_error))
expect(record.errors["hhmemb"]).to include(match(expected_error)) expect(record.errors["hhmemb"]).to include(match(hhmemb_expected_error))
end end
it "does not display an error if the data inputter says the letting is not a joint tenancy" do it "does not display an error if the data inputter says the letting is not a joint tenancy" do

Loading…
Cancel
Save