From fd5be3c6ef236ae462e241b58972934b7dfb2b9b Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 6 Aug 2024 08:32:32 +0100 Subject: [PATCH] Split about_price_not_rtb --- .../form/sales/pages/{about_price_not_rtb.rb => grant.rb} | 5 ++--- app/models/form/sales/pages/purchase_price.rb | 8 +++++--- .../form/sales/subsections/discounted_ownership_scheme.rb | 2 +- .../pages/{about_price_not_rtb_spec.rb => grant_spec.rb} | 6 +++--- spec/models/form/sales/pages/purchase_price_spec.rb | 5 ++--- .../sales/subsections/discounted_ownership_scheme_spec.rb | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) rename app/models/form/sales/pages/{about_price_not_rtb.rb => grant.rb} (64%) rename spec/models/form/sales/pages/{about_price_not_rtb_spec.rb => grant_spec.rb} (81%) diff --git a/app/models/form/sales/pages/about_price_not_rtb.rb b/app/models/form/sales/pages/grant.rb similarity index 64% rename from app/models/form/sales/pages/about_price_not_rtb.rb rename to app/models/form/sales/pages/grant.rb index 2f30548c7..7c7d2a625 100644 --- a/app/models/form/sales/pages/about_price_not_rtb.rb +++ b/app/models/form/sales/pages/grant.rb @@ -1,7 +1,7 @@ -class Form::Sales::Pages::AboutPriceNotRtb < ::Form::Page +class Form::Sales::Pages::Grant < ::Form::Page def initialize(id, hsh, subsection) super - @id = "about_price_not_rtb" + @id = "grant" @header = "About the price of the property" @depends_on = [{ "right_to_buy?" => false, @@ -11,7 +11,6 @@ class Form::Sales::Pages::AboutPriceNotRtb < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::PurchasePrice.new(nil, nil, self, ownershipsch: 2), Form::Sales::Questions::Grant.new(nil, nil, self), ] end diff --git a/app/models/form/sales/pages/purchase_price.rb b/app/models/form/sales/pages/purchase_price.rb index 783bd73d3..2203375ef 100644 --- a/app/models/form/sales/pages/purchase_price.rb +++ b/app/models/form/sales/pages/purchase_price.rb @@ -3,9 +3,11 @@ class Form::Sales::Pages::PurchasePrice < ::Form::Page super @id = "purchase_price" @header = "About the price of the property" - @depends_on = [{ - "right_to_buy?" => true, - }] + @depends_on = [{ "right_to_buy?" => true }, + { + "right_to_buy?" => false, + "rent_to_buy_full_ownership?" => false, + }] end def questions diff --git a/app/models/form/sales/subsections/discounted_ownership_scheme.rb b/app/models/form/sales/subsections/discounted_ownership_scheme.rb index 7221d2ca8..8131df4a7 100644 --- a/app/models/form/sales/subsections/discounted_ownership_scheme.rb +++ b/app/models/form/sales/subsections/discounted_ownership_scheme.rb @@ -14,7 +14,7 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection Form::Sales::Pages::Discount.new(nil, nil, self), Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_price_value_check", nil, self), Form::Sales::Pages::PercentageDiscountValueCheck.new("percentage_discount_value_check", nil, self), - Form::Sales::Pages::AboutPriceNotRtb.new(nil, nil, self), + Form::Sales::Pages::Grant.new(nil, nil, self), Form::Sales::Pages::GrantValueCheck.new(nil, nil, self), Form::Sales::Pages::PurchasePriceOutrightOwnership.new("purchase_price_discounted_ownership", nil, self, ownershipsch: 2), Form::Sales::Pages::DiscountedSaleValueCheck.new("discounted_sale_grant_value_check", nil, self), diff --git a/spec/models/form/sales/pages/about_price_not_rtb_spec.rb b/spec/models/form/sales/pages/grant_spec.rb similarity index 81% rename from spec/models/form/sales/pages/about_price_not_rtb_spec.rb rename to spec/models/form/sales/pages/grant_spec.rb index 95ed0fdb7..f88cdf9ae 100644 --- a/spec/models/form/sales/pages/about_price_not_rtb_spec.rb +++ b/spec/models/form/sales/pages/grant_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -RSpec.describe Form::Sales::Pages::AboutPriceNotRtb, type: :model do +RSpec.describe Form::Sales::Pages::Grant, type: :model do subject(:page) { described_class.new(page_id, page_definition, subsection) } let(:page_id) { nil } @@ -12,11 +12,11 @@ RSpec.describe Form::Sales::Pages::AboutPriceNotRtb, type: :model do end it "has correct questions" do - expect(page.questions.map(&:id)).to eq(%w[value grant]) + expect(page.questions.map(&:id)).to eq(%w[grant]) end it "has the correct id" do - expect(page.id).to eq("about_price_not_rtb") + expect(page.id).to eq("grant") end it "has the correct header" do diff --git a/spec/models/form/sales/pages/purchase_price_spec.rb b/spec/models/form/sales/pages/purchase_price_spec.rb index f0b762e90..57cf526ad 100644 --- a/spec/models/form/sales/pages/purchase_price_spec.rb +++ b/spec/models/form/sales/pages/purchase_price_spec.rb @@ -32,8 +32,7 @@ RSpec.describe Form::Sales::Pages::PurchasePrice, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([{ - "right_to_buy?" => true, - }]) + expect(page.depends_on).to eq([{ "right_to_buy?" => true }, + { "rent_to_buy_full_ownership?" => false, "right_to_buy?" => false }]) 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 8f4820f95..e703e713a 100644 --- a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb @@ -20,7 +20,7 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model discount extra_borrowing_price_value_check percentage_discount_value_check - about_price_not_rtb + grant grant_value_check purchase_price_discounted_ownership discounted_sale_grant_value_check