From 540276c743910ee242a35a44b0cf29e85b648638 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 14 Dec 2022 09:51:17 +0000 Subject: [PATCH] Use id argument and pass in full IDs --- app/models/form/page.rb | 2 +- app/models/form/sales/pages/buyer1_income_value_check.rb | 3 +-- app/models/form/sales/pages/mortgage_value_check.rb | 3 +-- .../form/sales/subsections/household_characteristics.rb | 2 +- .../form/sales/subsections/income_benefits_and_savings.rb | 8 ++++---- .../form/sales/pages/buyer1_income_value_check_spec.rb | 4 ++-- spec/models/form/sales/pages/mortgage_value_check_spec.rb | 4 ++-- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/models/form/page.rb b/app/models/form/page.rb index 617f570cb..33e944eed 100644 --- a/app/models/form/page.rb +++ b/app/models/form/page.rb @@ -2,7 +2,7 @@ class Form::Page attr_accessor :id, :header, :header_partial, :description, :questions, :depends_on, :title_text, :informative_text, :subsection, :hide_subsection_label, :next_unresolved_page_id - def initialize(id, hsh, subsection, _dynamic_values = {}) + def initialize(id, hsh, subsection) @id = id @subsection = subsection if hsh diff --git a/app/models/form/sales/pages/buyer1_income_value_check.rb b/app/models/form/sales/pages/buyer1_income_value_check.rb index 0440ea7f8..51170702e 100644 --- a/app/models/form/sales/pages/buyer1_income_value_check.rb +++ b/app/models/form/sales/pages/buyer1_income_value_check.rb @@ -1,7 +1,6 @@ class Form::Sales::Pages::Buyer1IncomeValueCheck < ::Form::Page - def initialize(id, hsh, subsection, dynamic_values = {}) + def initialize(id, hsh, subsection) super - @id = "#{dynamic_values.present? ? dynamic_values[:id_prefix] : ''}buyer_1_income_value_check" @header = "" @description = "" @subsection = subsection diff --git a/app/models/form/sales/pages/mortgage_value_check.rb b/app/models/form/sales/pages/mortgage_value_check.rb index 9bdbf84b4..7bbd62cf8 100644 --- a/app/models/form/sales/pages/mortgage_value_check.rb +++ b/app/models/form/sales/pages/mortgage_value_check.rb @@ -1,7 +1,6 @@ class Form::Sales::Pages::MortgageValueCheck < ::Form::Page - def initialize(id, hsh, subsection, dynamic_values) + def initialize(id, hsh, subsection) super - @id = "#{dynamic_values.present? ? dynamic_values[:id_prefix] : ''}mortgage_value_check" @header = "" @description = "" @subsection = subsection diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 015c82bbd..187d7c108 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -21,7 +21,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::Buyer1EthnicBackgroundWhite.new(nil, nil, self), Form::Sales::Pages::Nationality1.new(nil, nil, self), Form::Sales::Pages::Buyer1WorkingSituation.new(nil, nil, self), - Form::Sales::Pages::Buyer1IncomeValueCheck.new(nil, nil, self, { id_prefix: "working_situation_" }), + Form::Sales::Pages::Buyer1IncomeValueCheck.new("working_situation_buyer_1_income_value_check", nil, self), Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self), Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self), Form::Sales::Pages::Age2.new(nil, nil, self), diff --git a/app/models/form/sales/subsections/income_benefits_and_savings.rb b/app/models/form/sales/subsections/income_benefits_and_savings.rb index 465d1ed15..a9bc1a7c9 100644 --- a/app/models/form/sales/subsections/income_benefits_and_savings.rb +++ b/app/models/form/sales/subsections/income_benefits_and_savings.rb @@ -10,12 +10,12 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection def pages @pages ||= [ Form::Sales::Pages::Buyer1Income.new(nil, nil, self), - Form::Sales::Pages::Buyer1IncomeValueCheck.new(nil, nil, self), - Form::Sales::Pages::MortgageValueCheck.new(nil, nil, self, { id_prefix: "buyer_1_income_" }), + Form::Sales::Pages::Buyer1IncomeValueCheck.new("buyer_1_income_value_check", nil, self), + Form::Sales::Pages::MortgageValueCheck.new("buyer_1_income_mortgage_value_check", nil, self), Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self), - Form::Sales::Pages::MortgageValueCheck.new(nil, nil, self, { id_prefix: "buyer_1_" }), + Form::Sales::Pages::MortgageValueCheck.new("buyer_1_mortgage_value_check", nil, self), Form::Sales::Pages::Buyer2Income.new(nil, nil, self), - Form::Sales::Pages::MortgageValueCheck.new(nil, nil, self, { id_prefix: "buyer_2_income_" }), + Form::Sales::Pages::MortgageValueCheck.new("buyer_2_income_mortgage_value_check", nil, self), Form::Sales::Pages::Savings.new(nil, nil, self), Form::Sales::Pages::PreviousOwnership.new(nil, nil, self), ] diff --git a/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb b/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb index f2c1a7a57..18281533e 100644 --- a/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb +++ b/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb @@ -1,9 +1,9 @@ require "rails_helper" RSpec.describe Form::Sales::Pages::Buyer1IncomeValueCheck, type: :model do - subject(:page) { described_class.new(page_id, page_definition, subsection, { id_prefix: "prefix_" }) } + subject(:page) { described_class.new(page_id, page_definition, subsection) } - let(:page_id) { nil } + let(:page_id) { "prefix_buyer_1_income_value_check" } let(:page_definition) { nil } let(:subsection) { instance_double(Form::Subsection) } diff --git a/spec/models/form/sales/pages/mortgage_value_check_spec.rb b/spec/models/form/sales/pages/mortgage_value_check_spec.rb index 74a63db8b..b39daa468 100644 --- a/spec/models/form/sales/pages/mortgage_value_check_spec.rb +++ b/spec/models/form/sales/pages/mortgage_value_check_spec.rb @@ -1,9 +1,9 @@ require "rails_helper" RSpec.describe Form::Sales::Pages::MortgageValueCheck, type: :model do - subject(:page) { described_class.new(page_id, page_definition, subsection, { id_prefix: "buyer_1_income_" }) } + subject(:page) { described_class.new(page_id, page_definition, subsection) } - let(:page_id) { nil } + let(:page_id) { "buyer_1_income_mortgage_value_check" } let(:page_definition) { nil } let(:subsection) { instance_double(Form::Subsection) }