From 751f5fedf0704cd0ae0844a5b345c25522340153 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Fri, 14 Feb 2025 15:51:52 +0000 Subject: [PATCH] Update some tests --- spec/models/form/lettings/pages/address_fallback_spec.rb | 9 +-------- .../form/lettings/questions/uprn_confirmation_spec.rb | 8 ++++---- spec/models/form/lettings/questions/uprn_spec.rb | 8 ++++++++ spec/models/form/sales/pages/address_fallback_spec.rb | 9 +-------- spec/models/form/sales/pages/uprn_confirmation_spec.rb | 4 ++++ .../form/sales/subsections/property_information_spec.rb | 2 ++ 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spec/models/form/lettings/pages/address_fallback_spec.rb b/spec/models/form/lettings/pages/address_fallback_spec.rb index d3971d540..691b677ac 100644 --- a/spec/models/form/lettings/pages/address_fallback_spec.rb +++ b/spec/models/form/lettings/pages/address_fallback_spec.rb @@ -24,13 +24,6 @@ RSpec.describe Form::Lettings::Pages::AddressFallback, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([ - { "is_supported_housing?" => false, "uprn_known" => nil, "uprn_selection" => "uprn_not_listed" }, - { "is_supported_housing?" => false, "uprn_known" => 0, "uprn_selection" => "uprn_not_listed" }, - { "is_supported_housing?" => false, "uprn_confirmed" => 0, "uprn_selection" => "uprn_not_listed" }, - { "is_supported_housing?" => false, "uprn_known" => nil, "address_options_present?" => false }, - { "is_supported_housing?" => false, "uprn_known" => 0, "address_options_present?" => false }, - { "is_supported_housing?" => false, "uprn_confirmed" => 0, "address_options_present?" => false }, - ]) + expect(page.depends_on).to eq([{"address_search_input" => false, "is_supported_housing?" => false}]) end end diff --git a/spec/models/form/lettings/questions/uprn_confirmation_spec.rb b/spec/models/form/lettings/questions/uprn_confirmation_spec.rb index 748f8979d..591c65dac 100644 --- a/spec/models/form/lettings/questions/uprn_confirmation_spec.rb +++ b/spec/models/form/lettings/questions/uprn_confirmation_spec.rb @@ -51,16 +51,16 @@ RSpec.describe Form::Lettings::Questions::UprnConfirmation, type: :model do end describe "has the correct hidden_in_check_answers" do - context "when uprn_known != 1 && uprn_confirmed == nil" do - let(:log) { build(:lettings_log, uprn_known: 0, uprn_confirmed: nil) } + context "when uprn_known != 1 && uprn_confirmed == nil && address_search == nil" do + let(:log) { build(:lettings_log, uprn_known: 0, uprn_confirmed: nil, address_search: nil) } it "returns true" do expect(question.hidden_in_check_answers?(log)).to eq(true) end end - context "when uprn_known == 1 && uprn_confirmed == nil" do - let(:log) { build(:lettings_log, :completed, uprn_known: 1, uprn: 1, uprn_confirmed: nil) } + context "when uprn_known == 1 && uprn_confirmed == nil && address_search == 1" do + let(:log) { build(:lettings_log, :completed, uprn_known: 1, uprn: 1, address_search: nil, uprn_confirmed: nil) } it "returns false" do expect(question.hidden_in_check_answers?(log)).to eq(false) diff --git a/spec/models/form/lettings/questions/uprn_spec.rb b/spec/models/form/lettings/questions/uprn_spec.rb index 8bb932b35..7e54264bc 100644 --- a/spec/models/form/lettings/questions/uprn_spec.rb +++ b/spec/models/form/lettings/questions/uprn_spec.rb @@ -52,12 +52,16 @@ RSpec.describe Form::Lettings::Questions::Uprn, type: :model do la: "E09000003", uprn_known:, uprn:, + address_search:, + address_search_input:, ) end context "when uprn known nil" do let(:uprn_known) { nil } let(:uprn) { nil } + let(:address_search) { nil } + let(:address_search_input) { false } it "returns formatted value" do expect(question.get_extra_check_answer_value(log)).to be_nil @@ -67,6 +71,8 @@ RSpec.describe Form::Lettings::Questions::Uprn, type: :model do context "when uprn known" do let(:uprn_known) { 1 } let(:uprn) { 1 } + let(:address_search) { 1 } + let(:address_search_input) { true } it "returns formatted value" do expect(question.get_extra_check_answer_value(log)).to eq( @@ -78,6 +84,8 @@ RSpec.describe Form::Lettings::Questions::Uprn, type: :model do context "when uprn not known" do let(:uprn_known) { 0 } let(:uprn) { nil } + let(:address_search) { nil } + let(:address_search_input) { false } it "returns formatted value" do expect(question.get_extra_check_answer_value(log)).to be_nil diff --git a/spec/models/form/sales/pages/address_fallback_spec.rb b/spec/models/form/sales/pages/address_fallback_spec.rb index 4c48a46fe..bc8cffd7f 100644 --- a/spec/models/form/sales/pages/address_fallback_spec.rb +++ b/spec/models/form/sales/pages/address_fallback_spec.rb @@ -24,13 +24,6 @@ RSpec.describe Form::Sales::Pages::AddressFallback, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([ - { "uprn_known" => nil, "uprn_selection" => "uprn_not_listed" }, - { "uprn_known" => 0, "uprn_selection" => "uprn_not_listed" }, - { "uprn_confirmed" => 0, "uprn_selection" => "uprn_not_listed" }, - { "uprn_known" => nil, "address_options_present?" => false }, - { "uprn_known" => 0, "address_options_present?" => false }, - { "uprn_confirmed" => 0, "address_options_present?" => false }, - ]) + expect(page.depends_on).to eq([{"address_search_input" => false}]) end end diff --git a/spec/models/form/sales/pages/uprn_confirmation_spec.rb b/spec/models/form/sales/pages/uprn_confirmation_spec.rb index 9550b9f49..6415c2eb0 100644 --- a/spec/models/form/sales/pages/uprn_confirmation_spec.rb +++ b/spec/models/form/sales/pages/uprn_confirmation_spec.rb @@ -7,6 +7,10 @@ RSpec.describe Form::Sales::Pages::UprnConfirmation, type: :model do let(:page_definition) { nil } let(:subsection) { instance_double(Form::Subsection) } + before do + allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false)) + end + it "has correct subsection" do expect(page.subsection).to eq(subsection) end diff --git a/spec/models/form/sales/subsections/property_information_spec.rb b/spec/models/form/sales/subsections/property_information_spec.rb index ccfeb8e3a..446c363c5 100644 --- a/spec/models/form/sales/subsections/property_information_spec.rb +++ b/spec/models/form/sales/subsections/property_information_spec.rb @@ -57,6 +57,7 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do %w[ uprn uprn_confirmation + address_search address_matcher no_address_found uprn_selection @@ -91,6 +92,7 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do %w[ uprn uprn_confirmation + address_search address_matcher no_address_found uprn_selection