From e8dede48069c70cd2a0bf304e8cc6ced068b0446 Mon Sep 17 00:00:00 2001 From: Dushan Despotovic Date: Thu, 5 May 2022 15:26:13 +0100 Subject: [PATCH] updates --- app/models/validations/tenancy_validations.rb | 2 +- spec/models/validations/tenancy_validations_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/validations/tenancy_validations.rb b/app/models/validations/tenancy_validations.rb index c7ab9ffb0..390d5cac2 100644 --- a/app/models/validations/tenancy_validations.rb +++ b/app/models/validations/tenancy_validations.rb @@ -34,7 +34,7 @@ module Validations::TenancyValidations end def validate_joint_tenancy(record) - if !record.collection_start_year.blank? + return unless record.collection_start_year? 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 :hhmemb, I18n.t("validations.tenancy.not_joint") diff --git a/spec/models/validations/tenancy_validations_spec.rb b/spec/models/validations/tenancy_validations_spec.rb index cb8dd3bb8..43e5e3542 100644 --- a/spec/models/validations/tenancy_validations_spec.rb +++ b/spec/models/validations/tenancy_validations_spec.rb @@ -165,6 +165,7 @@ RSpec.describe Validations::TenancyValidations do record.joint = 2 tenancy_validator.validate_joint_tenancy(record) expect(record.errors["joint"]).to be_empty + expect(record.errors["hhmemb"]).to be_empty end end end