From da218e073b34d470f45857a9fd87aeb468893f0a Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire <94526761+natdeanlewissoftwire@users.noreply.github.com> Date: Fri, 21 Apr 2023 14:49:33 +0100 Subject: [PATCH] CLDC-2274 Fix buyer 2 nationality routing bug (#1546) * feat: fix buyer 2 nationality routing, use helper methods everywhere * feat: update tests and lint * feat: update test * refactor: lint * feat: fix tests --- app/models/form/sales/pages/age1.rb | 4 ++-- app/models/form/sales/pages/age2.rb | 8 ++++---- app/models/form/sales/pages/buyer1_ethnic_group.rb | 4 ++-- .../form/sales/pages/buyer1_live_in_property.rb | 4 ++-- .../form/sales/pages/buyer1_working_situation.rb | 4 ++-- app/models/form/sales/pages/buyer2_ethnic_group.rb | 8 ++++---- app/models/form/sales/pages/buyer2_income.rb | 2 +- .../form/sales/pages/buyer2_live_in_property.rb | 2 +- app/models/form/sales/pages/buyer2_mortgage.rb | 2 +- app/models/form/sales/pages/buyer2_nationality.rb | 11 ++++++++++- .../sales/pages/buyer2_relationship_to_buyer1.rb | 8 ++++---- .../form/sales/pages/buyer2_working_situation.rb | 8 ++++---- app/models/form/sales/pages/gender_identity1.rb | 4 ++-- app/models/form/sales/pages/gender_identity2.rb | 8 ++++---- app/models/form/sales/pages/housing_benefits.rb | 9 ++++++++- .../form/sales/pages/mortgage_value_check.rb | 2 +- app/models/form/sales/pages/nationality1.rb | 2 +- app/models/form/sales/pages/number_joint_buyers.rb | 2 +- .../sales/pages/number_of_others_in_property.rb | 2 +- app/models/form/sales/pages/person_known.rb | 6 +++--- app/models/sales_log.rb | 4 ++++ spec/models/form/sales/pages/age1_spec.rb | 2 +- spec/models/form/sales/pages/age2_spec.rb | 8 ++++---- .../form/sales/pages/buyer1_ethnic_group_spec.rb | 2 +- .../sales/pages/buyer1_live_in_property_spec.rb | 2 +- .../form/sales/pages/buyer2_ethnic_group_spec.rb | 8 ++++---- spec/models/form/sales/pages/buyer2_income_spec.rb | 2 +- .../sales/pages/buyer2_live_in_property_spec.rb | 2 +- .../form/sales/pages/buyer2_mortgage_spec.rb | 2 +- .../form/sales/pages/buyer2_nationality_spec.rb | 11 ++++++++++- .../pages/buyer2_relationship_to_buyer1_spec.rb | 8 ++++---- .../sales/pages/buyer2_working_situation_spec.rb | 8 ++++---- .../form/sales/pages/gender_identity1_spec.rb | 2 +- .../form/sales/pages/gender_identity2_spec.rb | 8 ++++---- .../form/sales/pages/housing_benefits_spec.rb | 4 ++-- .../form/sales/pages/mortgage_value_check_spec.rb | 2 +- spec/models/form/sales/pages/nationality1_spec.rb | 2 +- .../form/sales/pages/number_joint_buyers_spec.rb | 2 +- .../pages/number_of_others_in_property_spec.rb | 4 ++-- spec/models/form/sales/pages/person_known_spec.rb | 14 +++++++------- 40 files changed, 113 insertions(+), 84 deletions(-) diff --git a/app/models/form/sales/pages/age1.rb b/app/models/form/sales/pages/age1.rb index 5aed5c4f3..caa0948ee 100644 --- a/app/models/form/sales/pages/age1.rb +++ b/app/models/form/sales/pages/age1.rb @@ -4,10 +4,10 @@ class Form::Sales::Pages::Age1 < ::Form::Page @id = "buyer_1_age" @depends_on = [ { - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, }, { - "noint" => 1, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/age2.rb b/app/models/form/sales/pages/age2.rb index ff0666988..ee3bbc487 100644 --- a/app/models/form/sales/pages/age2.rb +++ b/app/models/form/sales/pages/age2.rb @@ -4,12 +4,12 @@ class Form::Sales::Pages::Age2 < ::Form::Page @id = "buyer_2_age" @depends_on = [ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/buyer1_ethnic_group.rb b/app/models/form/sales/pages/buyer1_ethnic_group.rb index 73d66b328..afd5a69f3 100644 --- a/app/models/form/sales/pages/buyer1_ethnic_group.rb +++ b/app/models/form/sales/pages/buyer1_ethnic_group.rb @@ -4,10 +4,10 @@ class Form::Sales::Pages::Buyer1EthnicGroup < ::Form::Page @id = "buyer_1_ethnic_group" @depends_on = [ { - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, }, { - "noint" => 1, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/buyer1_live_in_property.rb b/app/models/form/sales/pages/buyer1_live_in_property.rb index deb6275af..17877ee7b 100644 --- a/app/models/form/sales/pages/buyer1_live_in_property.rb +++ b/app/models/form/sales/pages/buyer1_live_in_property.rb @@ -4,10 +4,10 @@ class Form::Sales::Pages::Buyer1LiveInProperty < ::Form::Page @id = "buyer_1_live_in_property" @depends_on = [ { - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, }, { - "noint" => 1, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/buyer1_working_situation.rb b/app/models/form/sales/pages/buyer1_working_situation.rb index 66cf38e69..d9f33f8e9 100644 --- a/app/models/form/sales/pages/buyer1_working_situation.rb +++ b/app/models/form/sales/pages/buyer1_working_situation.rb @@ -4,10 +4,10 @@ class Form::Sales::Pages::Buyer1WorkingSituation < ::Form::Page @id = "buyer_1_working_situation" @depends_on = [ { - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, }, { - "noint" => 1, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/buyer2_ethnic_group.rb b/app/models/form/sales/pages/buyer2_ethnic_group.rb index 1b815996e..196063985 100644 --- a/app/models/form/sales/pages/buyer2_ethnic_group.rb +++ b/app/models/form/sales/pages/buyer2_ethnic_group.rb @@ -4,12 +4,12 @@ class Form::Sales::Pages::Buyer2EthnicGroup < ::Form::Page @id = "buyer_2_ethnic_group" @depends_on = [ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/buyer2_income.rb b/app/models/form/sales/pages/buyer2_income.rb index 65b88077d..f865418a7 100644 --- a/app/models/form/sales/pages/buyer2_income.rb +++ b/app/models/form/sales/pages/buyer2_income.rb @@ -3,7 +3,7 @@ class Form::Sales::Pages::Buyer2Income < ::Form::Page super @id = "buyer_2_income" @depends_on = [{ - "jointpur" => 1, + "joint_purchase?" => true, }] end diff --git a/app/models/form/sales/pages/buyer2_live_in_property.rb b/app/models/form/sales/pages/buyer2_live_in_property.rb index 3c0ce7b3b..193f434f8 100644 --- a/app/models/form/sales/pages/buyer2_live_in_property.rb +++ b/app/models/form/sales/pages/buyer2_live_in_property.rb @@ -5,7 +5,7 @@ class Form::Sales::Pages::Buyer2LiveInProperty < ::Form::Page @depends_on = [ { "joint_purchase?" => true, - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, }, { "joint_purchase?" => true, diff --git a/app/models/form/sales/pages/buyer2_mortgage.rb b/app/models/form/sales/pages/buyer2_mortgage.rb index e8b0c3718..36b512936 100644 --- a/app/models/form/sales/pages/buyer2_mortgage.rb +++ b/app/models/form/sales/pages/buyer2_mortgage.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::Buyer2Mortgage < ::Form::Page def initialize(id, hsh, subsection) super @id = "buyer_2_mortgage" - @depends_on = [{ "jointpur" => 1 }] + @depends_on = [{ "joint_purchase?" => true }] end def questions diff --git a/app/models/form/sales/pages/buyer2_nationality.rb b/app/models/form/sales/pages/buyer2_nationality.rb index 3771fe331..bd89b2203 100644 --- a/app/models/form/sales/pages/buyer2_nationality.rb +++ b/app/models/form/sales/pages/buyer2_nationality.rb @@ -2,7 +2,16 @@ class Form::Sales::Pages::Buyer2Nationality < ::Form::Page def initialize(id, hsh, subsection) super @id = "buyer_2_nationality" - @depends_on = [{ "joint_purchase?" => true }] + @depends_on = [ + { + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, + }, + { + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, + }, + ] end def questions diff --git a/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb b/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb index 7a1612d1f..0791769d8 100644 --- a/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb +++ b/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb @@ -4,12 +4,12 @@ class Form::Sales::Pages::Buyer2RelationshipToBuyer1 < ::Form::Page @id = "buyer_2_relationship_to_buyer_1" @depends_on = [ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/buyer2_working_situation.rb b/app/models/form/sales/pages/buyer2_working_situation.rb index 704fc0eac..1ff7bbecc 100644 --- a/app/models/form/sales/pages/buyer2_working_situation.rb +++ b/app/models/form/sales/pages/buyer2_working_situation.rb @@ -4,12 +4,12 @@ class Form::Sales::Pages::Buyer2WorkingSituation < ::Form::Page @id = "buyer_2_working_situation" @depends_on = [ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/gender_identity1.rb b/app/models/form/sales/pages/gender_identity1.rb index a9d333cf4..56fda88af 100644 --- a/app/models/form/sales/pages/gender_identity1.rb +++ b/app/models/form/sales/pages/gender_identity1.rb @@ -4,10 +4,10 @@ class Form::Sales::Pages::GenderIdentity1 < ::Form::Page @id = "buyer_1_gender_identity" @depends_on = [ { - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, }, { - "noint" => 1, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/gender_identity2.rb b/app/models/form/sales/pages/gender_identity2.rb index f79c3dc4a..94e585795 100644 --- a/app/models/form/sales/pages/gender_identity2.rb +++ b/app/models/form/sales/pages/gender_identity2.rb @@ -4,12 +4,12 @@ class Form::Sales::Pages::GenderIdentity2 < ::Form::Page @id = "buyer_2_gender_identity" @depends_on = [ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ] end diff --git a/app/models/form/sales/pages/housing_benefits.rb b/app/models/form/sales/pages/housing_benefits.rb index 670673bd8..e2b72790f 100644 --- a/app/models/form/sales/pages/housing_benefits.rb +++ b/app/models/form/sales/pages/housing_benefits.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::HousingBenefits < ::Form::Page def initialize(id, hsh, subsection, joint_purchase:) super(id, hsh, subsection) @joint_purchase = joint_purchase - @depends_on = [{ "jointpur" => @joint_purchase ? 1 : 2 }] end def questions @@ -10,4 +9,12 @@ class Form::Sales::Pages::HousingBenefits < ::Form::Page Form::Sales::Questions::HousingBenefits.new(nil, nil, self, joint_purchase: @joint_purchase), ] end + + def depends_on + if @joint_purchase + [{ "joint_purchase?" => true }] + else + [{ "not_joint_purchase?" => true }] + end + end end diff --git a/app/models/form/sales/pages/mortgage_value_check.rb b/app/models/form/sales/pages/mortgage_value_check.rb index b534f7fc5..4bff3556d 100644 --- a/app/models/form/sales/pages/mortgage_value_check.rb +++ b/app/models/form/sales/pages/mortgage_value_check.rb @@ -17,7 +17,7 @@ class Form::Sales::Pages::MortgageValueCheck < ::Form::Page [ { "mortgage_over_soft_max?" => true, - "jointpur" => 1, + "joint_purchase?" => true, }, ] else diff --git a/app/models/form/sales/pages/nationality1.rb b/app/models/form/sales/pages/nationality1.rb index 8db4a64ea..0fcc19b8f 100644 --- a/app/models/form/sales/pages/nationality1.rb +++ b/app/models/form/sales/pages/nationality1.rb @@ -4,7 +4,7 @@ class Form::Sales::Pages::Nationality1 < ::Form::Page @id = "buyer_1_nationality" @depends_on = [ { - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, }, { "buyer_not_interviewed?" => true, diff --git a/app/models/form/sales/pages/number_joint_buyers.rb b/app/models/form/sales/pages/number_joint_buyers.rb index 890280386..3a8c3475d 100644 --- a/app/models/form/sales/pages/number_joint_buyers.rb +++ b/app/models/form/sales/pages/number_joint_buyers.rb @@ -3,7 +3,7 @@ class Form::Sales::Pages::NumberJointBuyers < ::Form::Page super @id = "number_joint_buyers" @depends_on = [{ - "jointpur" => 1, + "joint_purchase?" => true, }] end diff --git a/app/models/form/sales/pages/number_of_others_in_property.rb b/app/models/form/sales/pages/number_of_others_in_property.rb index 4c6b9e621..23d670f93 100644 --- a/app/models/form/sales/pages/number_of_others_in_property.rb +++ b/app/models/form/sales/pages/number_of_others_in_property.rb @@ -3,7 +3,7 @@ class Form::Sales::Pages::NumberOfOthersInProperty < ::Form::Page super(id, hsh, subsection) @depends_on = [ { - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, "joint_purchase?" => joint_purchase, }, { diff --git a/app/models/form/sales/pages/person_known.rb b/app/models/form/sales/pages/person_known.rb index a837e70c5..c0affce76 100644 --- a/app/models/form/sales/pages/person_known.rb +++ b/app/models/form/sales/pages/person_known.rb @@ -13,18 +13,18 @@ class Form::Sales::Pages::PersonKnown < Form::Sales::Pages::Person def depends_on if @person_index == 2 - [{ "jointpur" => 2, + [{ "not_joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => 1, } }] else - [{ "jointpur" => 2, + [{ "not_joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => @person_index - 1, } }, - { "jointpur" => 1, + { "joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => @person_index - 2, diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index ebb3ef4e3..cacde4a88 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -272,6 +272,10 @@ class SalesLog < Log jointpur == 2 end + def buyer_has_seen_privacy_notice? + privacynotice == 1 + end + def buyer_not_interviewed? noint == 1 end diff --git a/spec/models/form/sales/pages/age1_spec.rb b/spec/models/form/sales/pages/age1_spec.rb index 6205610a0..b8deeca42 100644 --- a/spec/models/form/sales/pages/age1_spec.rb +++ b/spec/models/form/sales/pages/age1_spec.rb @@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Age1, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }]) + expect(page.depends_on).to eq([{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }]) end end diff --git a/spec/models/form/sales/pages/age2_spec.rb b/spec/models/form/sales/pages/age2_spec.rb index 2645b3724..c672e5876 100644 --- a/spec/models/form/sales/pages/age2_spec.rb +++ b/spec/models/form/sales/pages/age2_spec.rb @@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::Age2, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq([ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ]) end diff --git a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb index 52bbaff53..021d68d7a 100644 --- a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb +++ b/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb @@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicGroup, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }]) + expect(page.depends_on).to eq([{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }]) end end diff --git a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb index 6bdd4f5e2..27a00d36a 100644 --- a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb +++ b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb @@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }]) + expect(page.depends_on).to eq([{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }]) end end diff --git a/spec/models/form/sales/pages/buyer2_ethnic_group_spec.rb b/spec/models/form/sales/pages/buyer2_ethnic_group_spec.rb index 2767a2168..8a6e6fc4f 100644 --- a/spec/models/form/sales/pages/buyer2_ethnic_group_spec.rb +++ b/spec/models/form/sales/pages/buyer2_ethnic_group_spec.rb @@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::Buyer2EthnicGroup, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq([ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ]) end diff --git a/spec/models/form/sales/pages/buyer2_income_spec.rb b/spec/models/form/sales/pages/buyer2_income_spec.rb index 91f8b4014..d1bf34b7a 100644 --- a/spec/models/form/sales/pages/buyer2_income_spec.rb +++ b/spec/models/form/sales/pages/buyer2_income_spec.rb @@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Buyer2Income, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "jointpur" => 1 }]) + expect(page.depends_on).to eq([{ "joint_purchase?" => true }]) end end diff --git a/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb index 555e78927..bb6ca4b13 100644 --- a/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb +++ b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb @@ -31,7 +31,7 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do expect(page.depends_on).to eq([ { "joint_purchase?" => true, - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, }, { "joint_purchase?" => true, diff --git a/spec/models/form/sales/pages/buyer2_mortgage_spec.rb b/spec/models/form/sales/pages/buyer2_mortgage_spec.rb index b71dc5c59..7632203b2 100644 --- a/spec/models/form/sales/pages/buyer2_mortgage_spec.rb +++ b/spec/models/form/sales/pages/buyer2_mortgage_spec.rb @@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Buyer2Mortgage, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "jointpur" => 1 }]) + expect(page.depends_on).to eq([{ "joint_purchase?" => true }]) end end diff --git a/spec/models/form/sales/pages/buyer2_nationality_spec.rb b/spec/models/form/sales/pages/buyer2_nationality_spec.rb index 92c891f88..ba4c16b61 100644 --- a/spec/models/form/sales/pages/buyer2_nationality_spec.rb +++ b/spec/models/form/sales/pages/buyer2_nationality_spec.rb @@ -26,6 +26,15 @@ RSpec.describe Form::Sales::Pages::Buyer2Nationality, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq [{ "joint_purchase?" => true }] + expect(page.depends_on).to eq [ + { + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, + }, + { + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, + }, + ] end end diff --git a/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb b/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb index a518a1dc4..9e86a531d 100644 --- a/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb +++ b/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb @@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::Buyer2RelationshipToBuyer1, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq([ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ]) end diff --git a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb index 59c16c583..91037d147 100644 --- a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb +++ b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb @@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq([ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ]) end diff --git a/spec/models/form/sales/pages/gender_identity1_spec.rb b/spec/models/form/sales/pages/gender_identity1_spec.rb index 5188bb4ae..d59bf1bed 100644 --- a/spec/models/form/sales/pages/gender_identity1_spec.rb +++ b/spec/models/form/sales/pages/gender_identity1_spec.rb @@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::GenderIdentity1, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }]) + expect(page.depends_on).to eq([{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }]) end end diff --git a/spec/models/form/sales/pages/gender_identity2_spec.rb b/spec/models/form/sales/pages/gender_identity2_spec.rb index 54e7ab565..9d3c4752f 100644 --- a/spec/models/form/sales/pages/gender_identity2_spec.rb +++ b/spec/models/form/sales/pages/gender_identity2_spec.rb @@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::GenderIdentity2, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq([ { - "jointpur" => 1, - "privacynotice" => 1, + "joint_purchase?" => true, + "buyer_has_seen_privacy_notice?" => true, }, { - "jointpur" => 1, - "noint" => 1, + "joint_purchase?" => true, + "buyer_not_interviewed?" => true, }, ]) end diff --git a/spec/models/form/sales/pages/housing_benefits_spec.rb b/spec/models/form/sales/pages/housing_benefits_spec.rb index f4a591d40..d87e00850 100644 --- a/spec/models/form/sales/pages/housing_benefits_spec.rb +++ b/spec/models/form/sales/pages/housing_benefits_spec.rb @@ -30,7 +30,7 @@ RSpec.describe Form::Sales::Pages::HousingBenefits, type: :model do context "when joint_purchase is false" do it "has correct depends_on" do - expect(page.depends_on).to eq([{ "jointpur" => 2 }]) + expect(page.depends_on).to eq([{ "not_joint_purchase?" => true }]) end end @@ -38,7 +38,7 @@ RSpec.describe Form::Sales::Pages::HousingBenefits, type: :model do let(:joint_purchase) { true } it "has correct depends_on" do - expect(page.depends_on).to eq([{ "jointpur" => 1 }]) + expect(page.depends_on).to eq([{ "joint_purchase?" => true }]) end end end 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 38e7239c3..8c7375f81 100644 --- a/spec/models/form/sales/pages/mortgage_value_check_spec.rb +++ b/spec/models/form/sales/pages/mortgage_value_check_spec.rb @@ -43,7 +43,7 @@ RSpec.describe Form::Sales::Pages::MortgageValueCheck, type: :model do expect(page.depends_on).to eq([ { "mortgage_over_soft_max?" => true, - "jointpur" => 1, + "joint_purchase?" => true, }, ]) end diff --git a/spec/models/form/sales/pages/nationality1_spec.rb b/spec/models/form/sales/pages/nationality1_spec.rb index 37b58a89f..47e291915 100644 --- a/spec/models/form/sales/pages/nationality1_spec.rb +++ b/spec/models/form/sales/pages/nationality1_spec.rb @@ -26,6 +26,6 @@ RSpec.describe Form::Sales::Pages::Nationality1, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq [{ "privacynotice" => 1 }, { "buyer_not_interviewed?" => true }] + expect(page.depends_on).to eq [{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }] end end diff --git a/spec/models/form/sales/pages/number_joint_buyers_spec.rb b/spec/models/form/sales/pages/number_joint_buyers_spec.rb index 674bf2883..b114c3559 100644 --- a/spec/models/form/sales/pages/number_joint_buyers_spec.rb +++ b/spec/models/form/sales/pages/number_joint_buyers_spec.rb @@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::NumberJointBuyers, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "jointpur" => 1 }]) + expect(page.depends_on).to eq([{ "joint_purchase?" => true }]) end end diff --git a/spec/models/form/sales/pages/number_of_others_in_property_spec.rb b/spec/models/form/sales/pages/number_of_others_in_property_spec.rb index 9a0adaafb..6d757a0d5 100644 --- a/spec/models/form/sales/pages/number_of_others_in_property_spec.rb +++ b/spec/models/form/sales/pages/number_of_others_in_property_spec.rb @@ -31,7 +31,7 @@ RSpec.describe Form::Sales::Pages::NumberOfOthersInProperty, type: :model do it "has the correct depends_on" do expect(page.depends_on).to eq([ { - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, "joint_purchase?" => joint_purchase, }, { @@ -52,7 +52,7 @@ RSpec.describe Form::Sales::Pages::NumberOfOthersInProperty, type: :model do it "has the correct depends_on" do expect(page.depends_on).to eq([ { - "privacynotice" => 1, + "buyer_has_seen_privacy_notice?" => true, "joint_purchase?" => joint_purchase, }, { diff --git a/spec/models/form/sales/pages/person_known_spec.rb b/spec/models/form/sales/pages/person_known_spec.rb index 3e42b5c00..82f461f44 100644 --- a/spec/models/form/sales/pages/person_known_spec.rb +++ b/spec/models/form/sales/pages/person_known_spec.rb @@ -39,7 +39,7 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq([{ - "jointpur" => 2, + "not_joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => 1, @@ -67,14 +67,14 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq([ { - "jointpur" => 2, + "not_joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => 2, }, }, { - "jointpur" => 1, + "joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => 1, @@ -104,14 +104,14 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq([ { - "jointpur" => 2, + "not_joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => 3, }, }, { - "jointpur" => 1, + "joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => 2, @@ -140,14 +140,14 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq([ { - "jointpur" => 2, + "not_joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => 4, }, }, { - "jointpur" => 1, + "joint_purchase?" => true, "hholdcount" => { "operator" => ">=", "operand" => 3,