From 7ad289796fb25181448f9caa459a058d27193e33 Mon Sep 17 00:00:00 2001 From: Dushan Despotovic Date: Thu, 5 May 2022 14:33:26 +0100 Subject: [PATCH] fix validation and spec --- 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 ef4aaac32..4e2878175 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.hhmemb == 1 && record.joint != 2 + if record.hhmemb == 1 && record.joint != 2 && record.collection_start_year == 2022 record.errors.add :joint, I18n.t("validations.tenancy.not_joint") end end diff --git a/spec/models/validations/tenancy_validations_spec.rb b/spec/models/validations/tenancy_validations_spec.rb index 93c9506c1..0181c82de 100644 --- a/spec/models/validations/tenancy_validations_spec.rb +++ b/spec/models/validations/tenancy_validations_spec.rb @@ -149,6 +149,7 @@ RSpec.describe Validations::TenancyValidations do describe "joint tenancy validation" do context "when the data inputter has said that there is only one member in the household" do + let(:record) { FactoryBot.create(:case_log, startdate: Time.zone.local(2022, 5, 1)) } let(:expected_error) { I18n.t("validations.tenancy.not_joint") } it "displays an error if the data inputter says the letting is a joint tenancy" do