diff --git a/app/models/validations/sales/soft_validations.rb b/app/models/validations/sales/soft_validations.rb index 719075c06..ebe25c7d1 100644 --- a/app/models/validations/sales/soft_validations.rb +++ b/app/models/validations/sales/soft_validations.rb @@ -38,6 +38,8 @@ module Validations::Sales::SoftValidations end def extra_borrowing_expected? - true + return unless extrabor && mortgage && deposit && value && cashdis + + mortgage + deposit > value - value * discount / 100 end end diff --git a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb index 632ba85bc..27381a863 100644 --- a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb @@ -24,6 +24,7 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model mortgage_lender_other_discounted_ownership mortgage_length_discounted_ownership extra_borrowing_discounted_ownership + extra_borrowing_value_check_discounted_ownership about_deposit_discounted_ownership discounted_ownership_deposit_value_check leasehold_charges_discounted_ownership diff --git a/spec/models/form/sales/subsections/outright_sale_spec.rb b/spec/models/form/sales/subsections/outright_sale_spec.rb index 45a9f4ca0..3c11152e4 100644 --- a/spec/models/form/sales/subsections/outright_sale_spec.rb +++ b/spec/models/form/sales/subsections/outright_sale_spec.rb @@ -21,6 +21,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do mortgage_lender_other_outright_sale mortgage_length_outright_sale extra_borrowing_outright_sale + extra_borrowing_value_check_outright_sale about_deposit_outright_sale outright_sale_deposit_value_check leasehold_charges_outright_sale diff --git a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb index b453ed0d9..7db91fa37 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -32,6 +32,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do mortgage_lender_other_shared_ownership mortgage_length_shared_ownership extra_borrowing_shared_ownership + extra_borrowing_value_check_shared_ownership about_deposit_with_discount about_deposit_shared_ownership shared_ownership_deposit_value_check diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 40c23a9e3..513480de9 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,14 @@ RSpec.describe FormHandler do it "is able to load a current sales form" do form = form_handler.get_form("current_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(148) + expect(form.pages.count).to eq(151) expect(form.name).to eq("2022_2023_sales") end it "is able to load a previous sales form" do form = form_handler.get_form("previous_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(148) + expect(form.pages.count).to eq(151) expect(form.name).to eq("2021_2022_sales") end end