From 6d7d5a7a3353c72ad2f2edf194f959056e7f0186 Mon Sep 17 00:00:00 2001 From: Dushan Despotovic Date: Mon, 14 Mar 2022 16:34:44 +0000 Subject: [PATCH] fixes --- .../validations/household_validations.rb | 2 +- spec/factories/case_log.rb | 2 +- spec/fixtures/complete_case_log.json | 2 +- spec/fixtures/exports/case_logs.xml | 2 +- .../validations/household_validations_spec.rb | 22 +++++++++---------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index fd33f1699..d47b674ae 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -69,7 +69,7 @@ module Validations::HouseholdValidations all_options = [record.illness_type_1, record.illness_type_2, record.illness_type_3, record.illness_type_4, record.illness_type_5, record.illness_type_6, record.illness_type_7, record.illness_type_8, record.illness_type_9, record.illness_type_10] if all_options.count(1) >= 1 && record.illness != 0 record.errors.add :condition_effects, I18n.t("validations.household.condition_effects.no_choices") - end + end end def validate_previous_housing_situation(record) diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb index a7d9eb49a..c4c318ec2 100644 --- a/spec/factories/case_log.rb +++ b/spec/factories/case_log.rb @@ -51,7 +51,7 @@ FactoryBot.define do underoccupation_benefitcap { 0 } leftreg { 1 } reservist { 0 } - illness { 1 } + illness { 0 } preg_occ { 1 } tenancy_code { "BZ757" } startertenancy { 0 } diff --git a/spec/fixtures/complete_case_log.json b/spec/fixtures/complete_case_log.json index 6f3bf98e9..8b06563f4 100644 --- a/spec/fixtures/complete_case_log.json +++ b/spec/fixtures/complete_case_log.json @@ -44,7 +44,7 @@ "underoccupation_benefitcap": 0, "leftreg": 1, "reservist": 0, - "illness": 1, + "illness": 0, "preg_occ": 0, "tenancy_code": "BZ757", "startdate": "12/12/2021", diff --git a/spec/fixtures/exports/case_logs.xml b/spec/fixtures/exports/case_logs.xml index 0b6039cc9..bebd5f59f 100644 --- a/spec/fixtures/exports/case_logs.xml +++ b/spec/fixtures/exports/case_logs.xml @@ -38,7 +38,7 @@ 0 1 0 - 1 + 0 1 BZ757 0 diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb index 1e9f0d126..1fa676cf1 100644 --- a/spec/models/validations/household_validations_spec.rb +++ b/spec/models/validations/household_validations_spec.rb @@ -489,7 +489,7 @@ RSpec.describe Validations::HouseholdValidations do household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end + end it "validates hearing can't be selected if answer to anyone in household with health condition is not yes" do record.illness = 1 @@ -497,7 +497,7 @@ RSpec.describe Validations::HouseholdValidations do household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end + end it "validates mobility can't be selected if answer to anyone in household with health condition is not yes" do record.illness = 1 @@ -505,7 +505,7 @@ RSpec.describe Validations::HouseholdValidations do household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end + end it "validates dexterity can't be selected if answer to anyone in household with health condition is not yes" do record.illness = 1 @@ -513,7 +513,7 @@ RSpec.describe Validations::HouseholdValidations do household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end + 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 @@ -521,7 +521,7 @@ RSpec.describe Validations::HouseholdValidations do household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end + end it "validates memory can't be selected if answer to anyone in household with health condition is not yes" do record.illness = 1 @@ -529,7 +529,7 @@ RSpec.describe Validations::HouseholdValidations do household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end + 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 @@ -537,15 +537,15 @@ RSpec.describe Validations::HouseholdValidations do household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end - + 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_type_8 = 1 household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end + 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 @@ -553,7 +553,7 @@ RSpec.describe Validations::HouseholdValidations do household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end + end it "validates other can't be selected if answer to anyone in household with health condition is not yes" do record.illness = 1 @@ -561,7 +561,7 @@ RSpec.describe Validations::HouseholdValidations do household_validator.validate_condition_effects(record) expect(record.errors["condition_effects"]) .to include(match I18n.t("validations.household.condition_effects.no_choices")) - end + end end describe "accessibility requirement validations" do