From bbc8cc82b59af33b3cffd28d8d6eef0388992aa8 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Thu, 18 Jul 2024 14:23:23 +0100 Subject: [PATCH] Refactoring --- .../sales/financial_validations_spec.rb | 28 +++++++++---------- .../bulk_upload/lettings_log_to_csv.rb | 15 +--------- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/spec/models/validations/sales/financial_validations_spec.rb b/spec/models/validations/sales/financial_validations_spec.rb index 6ba1f5f60..dd71d0b24 100644 --- a/spec/models/validations/sales/financial_validations_spec.rb +++ b/spec/models/validations/sales/financial_validations_spec.rb @@ -320,21 +320,19 @@ RSpec.describe Validations::Sales::FinancialValidations do end context "when buyer 2 is a child" do - context "and saledate is current" do - let(:record) { build(:sales_log, :saledate_today, ecstat2: 9) } - - it "does not add an error if buyer 2 has no income" do - record.income2 = 0 - financial_validator.validate_child_income(record) - expect(record.errors).to be_empty - end - - it "adds errors if buyer 2 has an income" do - record.income2 = 40_000 - financial_validator.validate_child_income(record) - expect(record.errors["ecstat2"]).to include(match I18n.t("validations.financial.income.child_has_income")) - expect(record.errors["income2"]).to include(match I18n.t("validations.financial.income.child_has_income")) - end + let(:record) { build(:sales_log, :saledate_today, ecstat2: 9) } + + it "does not add an error if buyer 2 has no income" do + record.income2 = 0 + financial_validator.validate_child_income(record) + expect(record.errors).to be_empty + end + + it "adds errors if buyer 2 has an income" do + record.income2 = 40_000 + financial_validator.validate_child_income(record) + expect(record.errors["ecstat2"]).to include(match I18n.t("validations.financial.income.child_has_income")) + expect(record.errors["income2"]).to include(match I18n.t("validations.financial.income.child_has_income")) end end end diff --git a/spec/support/bulk_upload/lettings_log_to_csv.rb b/spec/support/bulk_upload/lettings_log_to_csv.rb index 675005356..18c367ffc 100644 --- a/spec/support/bulk_upload/lettings_log_to_csv.rb +++ b/spec/support/bulk_upload/lettings_log_to_csv.rb @@ -477,20 +477,7 @@ private end def rent_type - case log.rent_type - when LettingsLog::RENT_TYPE[:social_rent] - 1 - when LettingsLog::RENT_TYPE[:affordable_rent] - 2 - when LettingsLog::RENT_TYPE[:london_affordable_rent] - 3 - when LettingsLog::RENT_TYPE[:rent_to_buy] - 4 - when LettingsLog::RENT_TYPE[:london_living_rent] - 5 - when LettingsLog::RENT_TYPE[:other_intermediate_rent_product] - 6 - end + LettingsLog::RENTTYPE_DETAIL_MAPPING[log.rent_type] end def leftreg