diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index 3a77e9f22..7ed5f563c 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -179,5 +179,4 @@ private def tenant_is_economic_child?(economic_status) economic_status == 9 end - end diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb index 768eafcce..f4fc5dc8d 100644 --- a/app/models/validations/property_validations.rb +++ b/app/models/validations/property_validations.rb @@ -93,7 +93,7 @@ module Validations::PropertyValidations # see also: this validation in sales/property_validations.rb def validate_la_is_active(record) - return unless record.startdate.present? + return if record.startdate.blank? return unless record.la la = LocalAuthority.england.find_by(code: record.la) diff --git a/app/models/validations/sales/property_validations.rb b/app/models/validations/sales/property_validations.rb index cd44d3a57..360dc6d74 100644 --- a/app/models/validations/sales/property_validations.rb +++ b/app/models/validations/sales/property_validations.rb @@ -30,7 +30,7 @@ module Validations::Sales::PropertyValidations # see also: this validation in validations/property_validations.rb def validate_la_in_england(record) - return unless record.la.present? + return if record.la.blank? return if record.la.in?(LocalAuthority.england.pluck(:code)) record.errors.add :la, I18n.t("validations.sales.property_information.la.not_in_england") diff --git a/spec/models/validations/sales/soft_validations_spec.rb b/spec/models/validations/sales/soft_validations_spec.rb index 07c438ca8..9698f3883 100644 --- a/spec/models/validations/sales/soft_validations_spec.rb +++ b/spec/models/validations/sales/soft_validations_spec.rb @@ -644,14 +644,6 @@ RSpec.describe Validations::Sales::SoftValidations do expect(record).not_to be_grant_outside_common_range end - - it "returns true for logs with other type" do - record.grant = 100_000 - record.type = 9 - record.saledate = current_collection_start_date - - expect(record).to be_grant_outside_common_range - end end describe "#staircase_bought_above_fifty" do @@ -804,7 +796,6 @@ RSpec.describe Validations::Sales::SoftValidations do end end - describe "#buyer1_livein_wrong_for_ownership_type?" do context "when it's a shared ownership" do let(:record) { FactoryBot.build(:sales_log, ownershipsch: 1) }