From f0e97e0844f2e03b5b3b2e654522d311ead43527 Mon Sep 17 00:00:00 2001 From: Kat <54268893+kosiakkatrina@users.noreply.github.com> Date: Fri, 21 Feb 2025 14:37:08 +0000 Subject: [PATCH] lint --- app/models/form/lettings/pages/address_matcher.rb | 2 +- spec/models/form/lettings/pages/address_fallback_spec.rb | 2 +- spec/models/form/lettings/pages/address_matcher_spec.rb | 2 +- spec/models/form/lettings/pages/no_address_found_spec.rb | 2 +- spec/models/form/sales/pages/uprn_selection_spec.rb | 6 ------ 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/models/form/lettings/pages/address_matcher.rb b/app/models/form/lettings/pages/address_matcher.rb index 4acb17159d..c1cb1c464b 100644 --- a/app/models/form/lettings/pages/address_matcher.rb +++ b/app/models/form/lettings/pages/address_matcher.rb @@ -25,7 +25,7 @@ def skip_href(log = nil) def routed_to?(log, _) return false unless super return false if log.is_supported_housing? - return false if log.uprn_known != nil && log.uprn_known != 0 && log.uprn_confirmed != 0 + return false if !log.uprn_known.nil? && log.uprn_known != 0 && log.uprn_confirmed != 0 return false if log.is_new_build? && log.form.start_year_2025_or_later? true diff --git a/spec/models/form/lettings/pages/address_fallback_spec.rb b/spec/models/form/lettings/pages/address_fallback_spec.rb index f8a991e3d2..83254e2c9c 100644 --- a/spec/models/form/lettings/pages/address_fallback_spec.rb +++ b/spec/models/form/lettings/pages/address_fallback_spec.rb @@ -6,7 +6,7 @@ let(:page_id) { nil } let(:page_definition) { nil } let(:form) { Form.new(nil, 2024, [], "lettings") } - let(:subsection) { instance_double(Form::Subsection, form:, enabled?: true, depends_on:nil) } + let(:subsection) { instance_double(Form::Subsection, form:, enabled?: true, depends_on: nil) } it "has correct subsection" do expect(page.subsection).to eq(subsection) diff --git a/spec/models/form/lettings/pages/address_matcher_spec.rb b/spec/models/form/lettings/pages/address_matcher_spec.rb index 0e319ff12a..fa6c9d4901 100644 --- a/spec/models/form/lettings/pages/address_matcher_spec.rb +++ b/spec/models/form/lettings/pages/address_matcher_spec.rb @@ -6,7 +6,7 @@ let(:page_id) { nil } let(:page_definition) { nil } let(:form) { Form.new(nil, 2024, [], "lettings") } - let(:subsection) { instance_double(Form::Subsection, form:, enabled?: true, depends_on:nil) } + let(:subsection) { instance_double(Form::Subsection, form:, enabled?: true, depends_on: nil) } let(:log) { build(:lettings_log) } it "has correct subsection" do diff --git a/spec/models/form/lettings/pages/no_address_found_spec.rb b/spec/models/form/lettings/pages/no_address_found_spec.rb index ec6cd747a3..596104f5a1 100644 --- a/spec/models/form/lettings/pages/no_address_found_spec.rb +++ b/spec/models/form/lettings/pages/no_address_found_spec.rb @@ -6,7 +6,7 @@ let(:page_id) { nil } let(:page_definition) { nil } let(:form) { Form.new(nil, 2024, [], "lettings") } - let(:subsection) { instance_double(Form::Subsection, form:, enabled?: true, depends_on:nil) } + let(:subsection) { instance_double(Form::Subsection, form:, enabled?: true, depends_on: nil) } let(:log) { create(:lettings_log) } it "has correct subsection" do diff --git a/spec/models/form/sales/pages/uprn_selection_spec.rb b/spec/models/form/sales/pages/uprn_selection_spec.rb index 22e95bdf4b..ea6ac84075 100644 --- a/spec/models/form/sales/pages/uprn_selection_spec.rb +++ b/spec/models/form/sales/pages/uprn_selection_spec.rb @@ -33,10 +33,4 @@ "address-matcher", ) end - - it "has correct depends_on" do - expect(page.depends_on).to eq([{ "address_options_present?" => true, "uprn_known" => nil }, - { "address_options_present?" => true, "uprn_known" => 0 }, - { "address_options_present?" => true, "uprn_confirmed" => 0 }]) - end end