From 31ce30745abbfb6035e39eef09c472f438fad6fb Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 12 Jan 2022 15:05:59 +0000 Subject: [PATCH] update yes option to Yes for has_benefits\ --- app/models/case_log.rb | 5 +---- app/models/constants/case_log.rb | 5 +++++ config/forms/2021_2022.json | 4 ++-- spec/models/case_log_spec.rb | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 7a0813f8f..b74297ed5 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -311,10 +311,7 @@ private end def get_has_benefits - return "yes" if ["1. Housing benefit", - "6. Universal Credit with housing element (excluding housing benefit)", - "7. Universal Credit (without housing element)", - "8. Housing benefit and Universal Credit (without housing element)"].include?(hb) + return "Yes" if HAS_BENEFITS_OPTIONS.include?(hb) end def all_fields_completed? diff --git a/app/models/constants/case_log.rb b/app/models/constants/case_log.rb index e8e3c2a58..669e39147 100644 --- a/app/models/constants/case_log.rb +++ b/app/models/constants/case_log.rb @@ -1081,4 +1081,9 @@ module Constants::CaseLog "Yes – the household has a yearly income" => 2, "Tenant prefers not to say" => 3, }.freeze + + HAS_BENEFITS_OPTIONS = ["1. Housing benefit", + "6. Universal Credit with housing element (excluding housing benefit)", + "7. Universal Credit (without housing element)", + "8. Housing benefit and Universal Credit (without housing element)"].freeze end diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 5ffb83e74..b98ea55bd 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -2611,7 +2611,7 @@ } } }, - "depends_on": [{ "has_benefits": "yes", "nocharge": "Yes" },{ "has_benefits": "yes", "nocharge": null }] + "depends_on": [{ "has_benefits": "Yes", "nocharge": "Yes" },{ "has_benefits": "yes", "nocharge": null }] }, "rent_shortfall_amount":{ "header": "", @@ -2626,7 +2626,7 @@ "step": 1 } }, - "depends_on": [{"has_benefits": "yes", + "depends_on": [{"has_benefits": "Yes", "hbrentshortfall": "Yes" }] } diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb index 161b3263e..c98c32fb7 100644 --- a/spec/models/case_log_spec.rb +++ b/spec/models/case_log_spec.rb @@ -1225,7 +1225,7 @@ RSpec.describe Form, type: :model do case_log.reload record_from_db = ActiveRecord::Base.connection.execute("select has_benefits from case_logs where id=#{case_log.id}").to_a[0] - expect(record_from_db["has_benefits"]).to eq("yes") + expect(record_from_db["has_benefits"]).to eq("Yes") end end end