From f0732497d06b599527e0deb31e6f26b2ab547117 Mon Sep 17 00:00:00 2001 From: Arthur Campbell Date: Mon, 20 Mar 2023 17:17:50 +0000 Subject: [PATCH] add method to sales log and use in depends on to increase readability --- app/models/form/sales/pages/mortgage_amount.rb | 4 +--- app/models/sales_log.rb | 4 ++++ spec/models/form/sales/pages/mortgage_amount_spec.rb | 4 +--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/form/sales/pages/mortgage_amount.rb b/app/models/form/sales/pages/mortgage_amount.rb index 793570b46..73e306c2a 100644 --- a/app/models/form/sales/pages/mortgage_amount.rb +++ b/app/models/form/sales/pages/mortgage_amount.rb @@ -3,9 +3,7 @@ class Form::Sales::Pages::MortgageAmount < ::Form::Page super(id, hsh, subsection) @ownershipsch = ownershipsch @header = "Mortgage Amount" - @depends_on = [{ - "mortgageused" => 1, - }] + @depends_on = [{ "mortgage_used?" => true }] end def questions diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index c7fe68bca..ac9bd07e7 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -229,6 +229,10 @@ class SalesLog < Log ownershipsch == 2 end + def mortgage_used? + mortgageused == 1 + end + def mortgage_not_used? mortgageused == 2 end diff --git a/spec/models/form/sales/pages/mortgage_amount_spec.rb b/spec/models/form/sales/pages/mortgage_amount_spec.rb index 551788fbb..c6f6f924e 100644 --- a/spec/models/form/sales/pages/mortgage_amount_spec.rb +++ b/spec/models/form/sales/pages/mortgage_amount_spec.rb @@ -28,8 +28,6 @@ RSpec.describe Form::Sales::Pages::MortgageAmount, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([{ - "mortgageused" => 1, - }]) + expect(page.depends_on).to eq([{ "mortgage_used?" => true }]) end end