From e51a80d76673e60c7e9dc858404ebe5633264854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Meny?= Date: Wed, 20 Apr 2022 15:58:38 +0100 Subject: [PATCH] Adjust tests --- app/models/case_log.rb | 6 ++--- .../validations/household_validations.rb | 4 ++-- .../validations/household_validations_spec.rb | 22 +++++++++---------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 83fd49ba2..694043c48 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -339,12 +339,10 @@ class CaseLog < ApplicationRecord referral == 3 end - def is_prevten_general_needs_tenancy? + def is_prevten_la_general_needs? # 30: Fixed term Local Authority General Needs tenancy # 31: Lifetime Local Authority General Needs tenancy - # 32: Fixed term Private Registered Provider General Needs tenancy - # 33: Lifetime Private Registered Provider General Needs tenancy - [30, 31, 32, 33].any?(prevten) + [30, 31].any?(prevten) end def self.to_csv diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index d1ae4a7af..5d0f52037 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -105,7 +105,7 @@ module Validations::HouseholdValidations record.errors.add :homeless, I18n.t("validations.household.homeless.other.internal_transfer") end - if record.is_internal_transfer? && record.owning_organisation.provider_type == "PRP" && record.is_prevten_general_needs_tenancy? + if record.is_internal_transfer? && record.owning_organisation.provider_type == "PRP" && record.is_prevten_la_general_needs? record.errors.add :referral, I18n.t("validations.household.referral.la_general_needs.internal_transfer") record.errors.add :prevten, I18n.t("validations.household.prevten.la_general_needs.internal_transfer") end @@ -124,7 +124,7 @@ module Validations::HouseholdValidations private def household_no_illness?(record) - record.illness != 0 + record.illness != 1 end def women_of_child_bearing_age_in_household(record) diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb index cc3b697f0..6fdf72dc9 100644 --- a/spec/models/validations/household_validations_spec.rb +++ b/spec/models/validations/household_validations_spec.rb @@ -512,7 +512,7 @@ RSpec.describe Validations::HouseholdValidations do describe "condition effects validation" do it "validates vision can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_1 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -520,7 +520,7 @@ RSpec.describe Validations::HouseholdValidations do end it "validates hearing can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_2 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -528,7 +528,7 @@ RSpec.describe Validations::HouseholdValidations do end it "validates mobility can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_3 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -536,7 +536,7 @@ RSpec.describe Validations::HouseholdValidations do end it "validates dexterity can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_4 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -544,7 +544,7 @@ RSpec.describe Validations::HouseholdValidations do end it "validates learning or understanding or concentrating can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_5 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -552,7 +552,7 @@ RSpec.describe Validations::HouseholdValidations do end it "validates memory can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_6 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -560,7 +560,7 @@ RSpec.describe Validations::HouseholdValidations do end it "validates mental health can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_7 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -568,7 +568,7 @@ RSpec.describe Validations::HouseholdValidations do end it "validates stamina or breathing or fatigue can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_8 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -576,7 +576,7 @@ RSpec.describe Validations::HouseholdValidations do end it "validates socially or behaviourally can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_9 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -584,7 +584,7 @@ RSpec.describe Validations::HouseholdValidations do end it "validates other can't be selected if answer to anyone in household with health condition is not yes" do - record.illness = 1 + record.illness = 2 record.illness_type_10 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) @@ -592,7 +592,7 @@ RSpec.describe Validations::HouseholdValidations do end it "expects that an illness can be selected if answer to anyone in household with health condition is yes " do - record.illness = 0 + record.illness = 1 record.illness_type_1 = 1 record.illness_type_2 = 1 record.illness_type_3 = 1