From 5ea0cb89347a6354cbbaa7a67cb4179c5dcadb98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Meny?= Date: Mon, 6 Jun 2022 10:48:39 +0100 Subject: [PATCH] CLDC-1285: Pregnancy allowed to yes if a tenant's age is unknown --- app/models/validations/household_validations.rb | 10 ++++++++-- spec/models/validations/household_validations_spec.rb | 11 ++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index 1f67c12e1..52d2e9f01 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -134,12 +134,18 @@ private def women_of_child_bearing_age_in_household(record) (1..8).any? do |n| - next if record["sex#{n}"].nil? || record["age#{n}"].nil? + next if record["sex#{n}"].nil? - (record["sex#{n}"]) == "F" && record["age#{n}"] >= 11 && record["age#{n}"] <= 65 + record["sex#{n}"] == "F" && (in_pregnancy_age_range?(record, n) || record["age#{n}_known"] == 1) end end + def in_pregnancy_age_range?(record, person_num) + return false if record["age#{person_num}"].nil? + + record["age#{person_num}"] >= 11 && record["age#{person_num}"] <= 65 + end + def women_in_household(record) (1..8).any? do |n| record["sex#{n}"] == "F" diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb index 8780d0746..fc655f288 100644 --- a/spec/models/validations/household_validations_spec.rb +++ b/spec/models/validations/household_validations_spec.rb @@ -107,7 +107,7 @@ RSpec.describe Validations::HouseholdValidations do end context "and they are another household member and under 11" do - it "pregnancy can be yes" do + it "pregnancy cannot be yes" do record.preg_occ = 1 record.sex1 = "M" record.age1 = 25 @@ -118,6 +118,15 @@ RSpec.describe Validations::HouseholdValidations do .to include(match I18n.t("validations.household.preg_occ.no_female")) end end + + context "and one tenant's age is unknown" do + before { record.assign_attributes(sex1: "F", age1: nil, age1_known: 1, preg_occ: 1) } + + it "pregnancy can be yes" do + household_validator.validate_pregnancy(record) + expect(record.errors["preg_occ"]).to be_empty + end + end end end