From 91f95317e12b64a620cac1b35e66e2b8f7f29b42 Mon Sep 17 00:00:00 2001 From: Kat <54268893+kosiakkatrina@users.noreply.github.com> Date: Thu, 30 Jan 2025 10:40:24 +0000 Subject: [PATCH] Update model tests --- spec/factories/sales_log.rb | 5 +++-- spec/models/bulk_upload_spec.rb | 4 ++-- spec/models/validations/household_validations_spec.rb | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index d59a03907..40facd2d6 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -80,6 +80,7 @@ FactoryBot.define do noint { 2 } privacynotice { 1 } age1_known { 0 } + staircase { 1 } age1 { Faker::Number.within(range: 27..45) } sex1 { %w[F M X R].sample } national { 18 } @@ -110,10 +111,10 @@ FactoryBot.define do age6_known { 0 } age6 { 40 } income1nk { 0 } - income1 { 10_000 } + income1 { 13_400 } inc1mort { 1 } income2nk { 0 } - income2 { 10_000 } + income2 { 13_400 } inc2mort { 1 } uprn_known { 0 } address_line1 { "Address line 1" } diff --git a/spec/models/bulk_upload_spec.rb b/spec/models/bulk_upload_spec.rb index b07bef3c6..03342b627 100644 --- a/spec/models/bulk_upload_spec.rb +++ b/spec/models/bulk_upload_spec.rb @@ -21,10 +21,10 @@ RSpec.describe BulkUpload, type: :model do describe "value check clearing" do context "with a lettings log bulk upload" do - let(:log) { build(:lettings_log, :startdate_today, bulk_upload:) } + let(:log) { build(:lettings_log, startdate: Time.zone.local(2025, 4, 2), bulk_upload:) } it "has the correct number of value checks to be set as confirmed" do - expect(bulk_upload.fields_to_confirm(log)).to match_array %w[rent_value_check void_date_value_check major_repairs_date_value_check pregnancy_value_check retirement_value_check referral_value_check net_income_value_check carehome_charges_value_check scharge_value_check pscharge_value_check supcharg_value_check address_search_value_check multiple_partners_value_check partner_under_16_value_check reasonother_value_check] + expect(bulk_upload.fields_to_confirm(log)).to match_array %w[rent_value_check void_date_value_check major_repairs_date_value_check pregnancy_value_check retirement_value_check referral_value_check net_income_value_check scharge_value_check pscharge_value_check supcharg_value_check address_search_value_check multiple_partners_value_check partner_under_16_value_check reasonother_value_check] end end diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb index a48b80d1a..b6af03736 100644 --- a/spec/models/validations/household_validations_spec.rb +++ b/spec/models/validations/household_validations_spec.rb @@ -743,8 +743,9 @@ RSpec.describe Validations::HouseholdValidations do record.referral = 1 record.prevten = prevten[:code] household_validator.validate_previous_housing_situation(record) + label = record.form.start_year_2025_or_later? && prevten[:code] == 28 ? "Living with friends and family (long-term)" : prevten[:label] expect(record.errors["prevten"]) - .to include(match I18n.t("validations.lettings.household.prevten.internal_transfer", prevten: prevten[:label])) + .to include(match I18n.t("validations.lettings.household.prevten.internal_transfer", prevten: label)) expect(record.errors["referral"]) .to include(match I18n.t("validations.lettings.household.referral.prevten_invalid", prevten: "")) end