From 138fa18c983d047caff8241ac60f6e2c662413f6 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 6 Jan 2023 10:40:08 +0000 Subject: [PATCH] feat: update to main --- app/models/form/sales/pages/about_deposit.rb | 15 -------- app/models/form/sales/pages/about_price.rb | 18 ---------- .../sales/pages/about_price_social_housing.rb | 19 ---------- app/models/sales_log.rb | 1 + .../form/sales/pages/about_deposit_spec.rb | 33 ----------------- .../pages/about_price_social_housing_spec.rb | 35 ------------------- .../form/sales/pages/about_price_spec.rb | 35 ------------------- .../sales/subsections/outright_sale_spec.rb | 14 ++++---- 8 files changed, 9 insertions(+), 161 deletions(-) delete mode 100644 app/models/form/sales/pages/about_deposit.rb delete mode 100644 app/models/form/sales/pages/about_price.rb delete mode 100644 app/models/form/sales/pages/about_price_social_housing.rb delete mode 100644 spec/models/form/sales/pages/about_deposit_spec.rb delete mode 100644 spec/models/form/sales/pages/about_price_social_housing_spec.rb delete mode 100644 spec/models/form/sales/pages/about_price_spec.rb diff --git a/app/models/form/sales/pages/about_deposit.rb b/app/models/form/sales/pages/about_deposit.rb deleted file mode 100644 index 415908567..000000000 --- a/app/models/form/sales/pages/about_deposit.rb +++ /dev/null @@ -1,15 +0,0 @@ -class Form::Sales::Pages::AboutDeposit < ::Form::Page - def initialize(id, hsh, subsection) - super - @header = "About the deposit" - @description = "" - @subsection = subsection - end - - def questions - @questions ||= [ - Form::Sales::Questions::DepositAmount.new(nil, nil, self), - Form::Sales::Questions::DepositDiscount.new(nil, nil, self), - ] - end -end diff --git a/app/models/form/sales/pages/about_price.rb b/app/models/form/sales/pages/about_price.rb deleted file mode 100644 index f5641791d..000000000 --- a/app/models/form/sales/pages/about_price.rb +++ /dev/null @@ -1,18 +0,0 @@ -class Form::Sales::Pages::AboutPrice < ::Form::Page - def initialize(id, hsh, subsection) - super - @id = "about_price" - @header = "About the price of the property" - @description = "" - @subsection = subsection - @depends_on = [{ - "soctenant" => 2, - }] - end - - def questions - @questions ||= [ - Form::Sales::Questions::Value.new(nil, nil, self), - ] - end -end diff --git a/app/models/form/sales/pages/about_price_social_housing.rb b/app/models/form/sales/pages/about_price_social_housing.rb deleted file mode 100644 index bf8045f3d..000000000 --- a/app/models/form/sales/pages/about_price_social_housing.rb +++ /dev/null @@ -1,19 +0,0 @@ -class Form::Sales::Pages::AboutPriceSocialHousing < ::Form::Page - def initialize(id, hsh, subsection) - super - @id = "about_price_social_housing" - @header = "About the price of the property" - @description = "" - @subsection = subsection - @depends_on = [{ - "soctenant" => 1, - }] - end - - def questions - @questions ||= [ - Form::Sales::Questions::Value.new(nil, nil, self), - Form::Sales::Questions::Equity.new(nil, nil, self), - ] - end -end diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 7af965e16..a613a27c2 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -2,6 +2,7 @@ class SalesLogValidator < ActiveModel::Validator include Validations::Sales::HouseholdValidations include Validations::SharedValidations include Validations::Sales::FinancialValidations + include Validations::LocalAuthorityValidations def validate(record) validation_methods = public_methods.select { |method| method.starts_with?("validate_") } diff --git a/spec/models/form/sales/pages/about_deposit_spec.rb b/spec/models/form/sales/pages/about_deposit_spec.rb deleted file mode 100644 index e22cf1e76..000000000 --- a/spec/models/form/sales/pages/about_deposit_spec.rb +++ /dev/null @@ -1,33 +0,0 @@ -require "rails_helper" - -RSpec.describe Form::Sales::Pages::AboutDeposit, type: :model do - subject(:page) { described_class.new(page_id, page_definition, subsection) } - - let(:page_id) { nil } - let(:page_definition) { nil } - let(:subsection) { instance_double(Form::Subsection) } - - it "has correct subsection" do - expect(page.subsection).to eq(subsection) - end - - it "has correct questions" do - expect(page.questions.map(&:id)).to eq(%w[deposit cashdis]) - end - - it "has the correct id" do - expect(page.id).to eq(nil) - end - - it "has the correct header" do - expect(page.header).to eq("About the deposit") - end - - it "has the correct description" do - expect(page.description).to eq("") - end - - it "has correct depends_on" do - expect(page.depends_on).to be_nil - end -end diff --git a/spec/models/form/sales/pages/about_price_social_housing_spec.rb b/spec/models/form/sales/pages/about_price_social_housing_spec.rb deleted file mode 100644 index acdcd7dd3..000000000 --- a/spec/models/form/sales/pages/about_price_social_housing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "rails_helper" - -RSpec.describe Form::Sales::Pages::AboutPriceSocialHousing, type: :model do - subject(:page) { described_class.new(page_id, page_definition, subsection) } - - let(:page_id) { nil } - let(:page_definition) { nil } - let(:subsection) { instance_double(Form::Subsection) } - - it "has correct subsection" do - expect(page.subsection).to eq(subsection) - end - - it "has correct questions" do - expect(page.questions.map(&:id)).to eq(%w[value equity]) - end - - it "has the correct id" do - expect(page.id).to eq("about_price_social_housing") - end - - it "has the correct header" do - expect(page.header).to eq("About the price of the property") - end - - it "has the correct description" do - expect(page.description).to eq("") - end - - it "has correct depends_on" do - expect(page.depends_on).to eq([{ - "soctenant" => 1, - }]) - end -end diff --git a/spec/models/form/sales/pages/about_price_spec.rb b/spec/models/form/sales/pages/about_price_spec.rb deleted file mode 100644 index d6c45cd4b..000000000 --- a/spec/models/form/sales/pages/about_price_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "rails_helper" - -RSpec.describe Form::Sales::Pages::AboutPrice, type: :model do - subject(:page) { described_class.new(page_id, page_definition, subsection) } - - let(:page_id) { nil } - let(:page_definition) { nil } - let(:subsection) { instance_double(Form::Subsection) } - - it "has correct subsection" do - expect(page.subsection).to eq(subsection) - end - - it "has correct questions" do - expect(page.questions.map(&:id)).to eq(%w[value]) - end - - it "has the correct id" do - expect(page.id).to eq("about_price") - end - - it "has the correct header" do - expect(page.header).to eq("About the price of the property") - end - - it "has the correct description" do - expect(page.description).to eq("") - end - - it "has correct depends_on" do - expect(page.depends_on).to eq([{ - "soctenant" => 2, - }]) - end -end diff --git a/spec/models/form/sales/subsections/outright_sale_spec.rb b/spec/models/form/sales/subsections/outright_sale_spec.rb index c331e3b8e..06b394f27 100644 --- a/spec/models/form/sales/subsections/outright_sale_spec.rb +++ b/spec/models/form/sales/subsections/outright_sale_spec.rb @@ -13,12 +13,14 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do it "has correct pages" do expect(outright_sale.pages.map(&:id)).to eq( - %w[purchase_price - mortgage_used_outright_sale - mortgage_amount_outright_sale - about_deposit_outright_sale - outright_sale_deposit_value_check - leasehold_charges_outright_sale], + %w[ + purchase_price + mortgage_used_outright_sale + mortgage_amount_outright_sale + about_deposit_outright_sale + outright_sale_deposit_value_check + leasehold_charges_outright_sale + ], ) end