From d1298ff10d30320c8a422b8f91b17bf09830e532 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Wed, 13 Mar 2024 09:08:47 +0000 Subject: [PATCH] CLDC-3278: Restructure tenancy length validations to only error on relevant fields (#2295) * CLDC-3278: Restructure tenancy length validations to only error on relevant fields * Update error messages to reflect when length is allowed to be blank correctly * Don't depend on the rent_type for supported housing * Rename functions for clarity --- app/models/validations/tenancy_validations.rb | 105 +++-- config/locales/en.yml | 10 +- spec/models/lettings_log_spec.rb | 9 +- .../validations/tenancy_validations_spec.rb | 427 +++++++++--------- 4 files changed, 276 insertions(+), 275 deletions(-) diff --git a/app/models/validations/tenancy_validations.rb b/app/models/validations/tenancy_validations.rb index 26cccdd81..bd55203fb 100644 --- a/app/models/validations/tenancy_validations.rb +++ b/app/models/validations/tenancy_validations.rb @@ -3,48 +3,65 @@ module Validations::TenancyValidations # or 'validate_' to run on submit as well include Validations::SharedValidations - def validate_fixed_term_tenancy(record) - is_present = record.tenancylength.present? - is_in_range = record.tenancylength.to_i.between?(min_tenancy_length(record), 99) - rent_type_dependent_conditions = [ - { - condition: (record.is_assured_shorthold_tenancy? && !is_in_range) && is_present, - error: I18n.t( - "validations.tenancy.length.shorthold", - min_tenancy_length: min_tenancy_length(record), - ), - }, - { - condition: (record.is_secure_tenancy? && !is_in_range) && is_present, - error: I18n.t( - "validations.tenancy.length.secure", - min_tenancy_length: min_tenancy_length(record), - ), - }, - { - condition: (record.is_periodic_tenancy? && !is_in_range) && is_present, - error: I18n.t( - "validations.tenancy.length.secure", - min_tenancy_length: min_tenancy_length(record), - ), - }, - ] - rent_type_independent_conditions = [ - { - condition: !(record.is_secure_tenancy? || record.is_assured_shorthold_tenancy? || record.is_periodic_tenancy?) && is_present, - error: I18n.t("validations.tenancy.length.fixed_term_not_required"), - }, - ] - conditions = rent_type_dependent_conditions + rent_type_independent_conditions - - conditions.each do |condition| - next unless condition[:condition] - - record.errors.add :needstype, condition[:error] - record.errors.add :rent_type, condition[:error] if rent_type_dependent_conditions.include?(condition) - record.errors.add :tenancylength, :tenancylength_invalid, message: condition[:error] - record.errors.add :tenancy, condition[:error] - end + def validate_supported_housing_fixed_tenancy_length(record) + return unless record.tenancy_type_fixed_term? && record.is_supported_housing? + return if record.tenancylength.blank? + + min_tenancy_length = 1 + return if record.tenancylength.to_i.between?(min_tenancy_length, 99) + + message = I18n.t("validations.tenancy.length.invalid_fixed", min_tenancy_length:) + record.errors.add :needstype, message + record.errors.add :tenancylength, :tenancylength_invalid, message: message + record.errors.add :tenancy, message + end + + def validate_general_needs_fixed_tenancy_length_affordable_social_rent(record) + return unless record.tenancy_type_fixed_term? && record.affordable_or_social_rent? && record.is_general_needs? + return if record.tenancylength.blank? + + min_tenancy_length = 2 + return if record.tenancylength.to_i.between?(min_tenancy_length, 99) + + message = I18n.t("validations.tenancy.length.invalid_fixed", min_tenancy_length:) + record.errors.add :needstype, message + record.errors.add :rent_type, message + record.errors.add :tenancylength, :tenancylength_invalid, message: message + record.errors.add :tenancy, message + end + + def validate_general_needs_fixed_tenancy_length_intermediate_rent(record) + return unless record.tenancy_type_fixed_term? && !record.affordable_or_social_rent? && record.is_general_needs? + return if record.tenancylength.blank? + + min_tenancy_length = 1 + return if record.tenancylength.to_i.between?(min_tenancy_length, 99) + + message = I18n.t("validations.tenancy.length.invalid_fixed", min_tenancy_length:) + record.errors.add :needstype, message + record.errors.add :rent_type, message + record.errors.add :tenancylength, :tenancylength_invalid, message: message + record.errors.add :tenancy, message + end + + def validate_periodic_tenancy_length(record) + return unless record.is_periodic_tenancy? && record.tenancylength.present? + + min_tenancy_length = 1 + return if record.tenancylength.to_i.between?(min_tenancy_length, 99) + + message = I18n.t("validations.tenancy.length.invalid_periodic", min_tenancy_length:) + record.errors.add :tenancylength, :tenancylength_invalid, message: message + record.errors.add :tenancy, message + end + + def validate_tenancy_length_blank_when_not_required(record) + return if record.tenancylength.blank? + return if record.tenancy_type_fixed_term? || record.is_periodic_tenancy? + + message = I18n.t("validations.tenancy.length.fixed_term_not_required") + record.errors.add :tenancylength, :tenancylength_invalid, message: message + record.errors.add :tenancy, message end def validate_other_tenancy_type(record) @@ -59,8 +76,4 @@ module Validations::TenancyValidations record.errors.add :hhmemb, I18n.t("validations.tenancy.joint_more_than_one_member") end end - - def min_tenancy_length(record) - record.is_supported_housing? || record.renttype == 3 || record.is_periodic_tenancy? ? 1 : 2 - end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 655723e58..f30de4119 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -558,8 +558,8 @@ en: tenancy: length: fixed_term_not_required: "You must only answer the length of the tenancy if it's fixed-term" - shorthold: "Enter a tenancy length between %{min_tenancy_length} and 99 years for a tenancy of this type" - secure: "Enter a tenancy length between %{min_tenancy_length} and 99 years (or don't specify the length) for a tenancy of this type" + invalid_fixed: "Enter a tenancy length between %{min_tenancy_length} and 99 years for a tenancy of this type" + invalid_periodic: "Enter a tenancy length between %{min_tenancy_length} and 99 years (or don't specify the length) for a tenancy of this type" internal_transfer: "Answer must be secure tenancy as this tenancy is an internal transfer" cannot_be_internal_transfer: "Answer cannot be internal transfer as this is not a secure tenancy" not_joint: "This cannot be a joint tenancy as you've told us there's only one person in the household" @@ -691,7 +691,7 @@ Make sure these answers are correct." shared_ownership_deposit: title_text: "You told us that the %{mortgage_deposit_and_discount_error_fields} add up to %{mortgage_deposit_and_discount_total}" old_persons_shared_ownership: - title_text: + title_text: one: "You told us the buyer is using the Older Persons Shared Ownership scheme." two: "You told us the buyers are using the Older Persons Shared Ownership scheme." hint_text: "At least one buyer must be aged 65 years and over to use this scheme." @@ -718,12 +718,12 @@ Make sure these answers are correct." title_text: "You told us that the percentage discount is %{discount}." hint_text: "This is higher than we would expect." savings: - title_text: + title_text: one: "You told us the buyer’s savings were %{savings}." two: "You told us the buyers’ savings were %{savings}." hint_text: "This is higher than we would expect." deposit: - title_text: + title_text: one: "You told us the buyer’s deposit was %{deposit} and their savings were %{savings}." two: "You told us the buyers’ deposit was %{deposit} and their savings were %{savings}." hint_text: "The deposit amount is higher than we would expect for the amount of savings they have." diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb index 225a25952..d702a3805 100644 --- a/spec/models/lettings_log_spec.rb +++ b/spec/models/lettings_log_spec.rb @@ -112,10 +112,17 @@ RSpec.describe LettingsLog do end it "validates tenancy type" do - expect(validator).to receive(:validate_fixed_term_tenancy) expect(validator).to receive(:validate_other_tenancy_type) end + it "validates tenancy length" do + expect(validator).to receive(:validate_supported_housing_fixed_tenancy_length) + expect(validator).to receive(:validate_general_needs_fixed_tenancy_length_affordable_social_rent) + expect(validator).to receive(:validate_general_needs_fixed_tenancy_length_intermediate_rent) + expect(validator).to receive(:validate_periodic_tenancy_length) + expect(validator).to receive(:validate_tenancy_length_blank_when_not_required) + end + it "validates the previous postcode" do expect(validator).to receive(:validate_previous_accommodation_postcode) end diff --git a/spec/models/validations/tenancy_validations_spec.rb b/spec/models/validations/tenancy_validations_spec.rb index 3d39e1e39..f5ffc05b0 100644 --- a/spec/models/validations/tenancy_validations_spec.rb +++ b/spec/models/validations/tenancy_validations_spec.rb @@ -3,280 +3,272 @@ require "rails_helper" RSpec.describe Validations::TenancyValidations do subject(:tenancy_validator) { validator_class.new } - before do - Timecop.freeze(Time.zone.local(2021, 5, 1)) - end + let(:validator_class) { Class.new { include Validations::TenancyValidations } } - after do - Timecop.unfreeze - end + describe "tenancy length validations" do + let(:record) { FactoryBot.create(:lettings_log, :setup_completed) } - let(:validator_class) { Class.new { include Validations::TenancyValidations } } - let(:record) { FactoryBot.create(:lettings_log, startdate: Time.zone.local(2021, 5, 1), needstype: 1, rent_type: 1) } - - describe "fixed term tenancy validations" do - context "when fixed term tenancy" do - context "when type of tenancy is not assured or assured shorthold" do - let(:expected_error) { I18n.t("validations.tenancy.length.fixed_term_not_required") } - - it "tenancy length should not be present" do - record.tenancy = 3 - record.tenancylength = 10 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["rent_type"]).not_to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) - end - end + shared_examples "adds expected errors based on the tenancy length" do |tenancy_type_case, error_fields, min_tenancy_length| + context "and tenancy type is #{tenancy_type_case[:name]}" do + let(:expected_error) { tenancy_type_case[:expected_error].call(min_tenancy_length) } - context "when type of tenancy is assured shorthold" do - let(:expected_error) do - I18n.t( - "validations.tenancy.length.shorthold", - min_tenancy_length: 2, - ) - end + before { record.tenancy = tenancy_type_case[:code] } - before { record.tenancy = 4 } + context "and tenancy length is less than #{min_tenancy_length}" do + before { record.tenancylength = min_tenancy_length - 1 } - context "when tenancy length is less than 2" do - it "adds an error" do - record.tenancylength = 1 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["rent_type"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) + it "adds errors to #{error_fields.join(', ')}" do + validation.call(record) + error_fields.each do |field| + expect(record.errors[field]).to include(match(expected_error)) + end + expect(record.errors.size).to be(error_fields.length) end end - context "when tenancy length is greater than 99" do - it "adds an error" do - record.tenancylength = 100 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["rent_type"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) + context "and tenancy length is more than 99" do + before { record.tenancylength = 100 } + + it "adds errors to #{error_fields.join(', ')}" do + validation.call(record) + error_fields.each do |field| + expect(record.errors[field]).to include(match(expected_error)) + end + expect(record.errors.size).to be(error_fields.length) end end - context "when tenancy length is between 2-99" do - it "does not add an error" do - record.tenancylength = 3 - tenancy_validator.validate_fixed_term_tenancy(record) + context "and tenancy length is between #{min_tenancy_length} and 99" do + before { record.tenancylength = min_tenancy_length } + + it "does not add errors" do + validation.call(record) expect(record.errors).to be_empty end end - context "when tenancy length has not been answered" do - it "does not add an error" do - record.tenancylength = nil - tenancy_validator.validate_fixed_term_tenancy(record) + context "and tenancy length is not set" do + before { record.tenancylength = nil } + + it "does not add errors" do + validation.call(record) expect(record.errors).to be_empty end end end + end - context "when the collection start year is before 2022" do - context "when type of tenancy is secure" do - let(:expected_error) do - I18n.t( - "validations.tenancy.length.secure", - min_tenancy_length: 2, - ) - end + shared_examples "does not add errors when tenancy type is not fixed term" do + context "and tenancy type is not fixed term" do + before do + record.tenancy = 8 + record.tenancylength = 0 + end + + it "does not add errors" do + validation.call(record) + expect(record.errors).to be_empty + end + end + end - before { record.tenancy = 1 } + fixed_term_tenancy_type_cases = [ + { + name: "assured shorthold", + code: 4, + expected_error: ->(min_tenancy_length) { I18n.t("validations.tenancy.length.invalid_fixed", min_tenancy_length:) }, + }, + { + name: "secure fixed term", + code: 6, + expected_error: ->(min_tenancy_length) { I18n.t("validations.tenancy.length.invalid_fixed", min_tenancy_length:) }, + }, + ] + + describe "#validate_supported_housing_fixed_tenancy_length" do + subject(:validation) { ->(record) { tenancy_validator.validate_supported_housing_fixed_tenancy_length(record) } } + + context "when needs type is supported housing" do + before { record.needstype = 2 } + + error_fields = %w[needstype tenancylength tenancy] + fixed_term_tenancy_type_cases.each do |tenancy_type_case| + include_examples "adds expected errors based on the tenancy length", tenancy_type_case, error_fields, 1 + end - context "when tenancy length is less than 2" do - it "adds an error" do - record.tenancylength = 1 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) - end - end + include_examples "does not add errors when tenancy type is not fixed term" + end - context "when tenancy length is greater than 99" do - it "adds an error" do - record.tenancylength = 100 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) - end + context "when needs type is general needs" do + before do + record.needstype = 1 + record.tenancy = 4 + record.tenancylength = 0 + end + + it "does not add errors" do + validation.call(record) + expect(record.errors).to be_empty + end + end + end + + describe "#validate_general_needs_fixed_tenancy_length_affordable_social_rent" do + subject(:validation) { ->(record) { tenancy_validator.validate_general_needs_fixed_tenancy_length_affordable_social_rent(record) } } + + context "when needs type is general needs" do + before { record.needstype = 1 } + + context "and rent type is affordable or social rent" do + before { record.renttype = 1 } + + error_fields = %w[needstype rent_type tenancylength tenancy] + fixed_term_tenancy_type_cases.each do |tenancy_type_case| + include_examples "adds expected errors based on the tenancy length", tenancy_type_case, error_fields, 2 end - context "when tenancy length is between 2-99" do - it "does not add an error" do - record.tenancylength = 3 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors).to be_empty - end + include_examples "does not add errors when tenancy type is not fixed term" + end + + context "and rent type is intermediate rent" do + before do + record.renttype = 3 + record.tenancy = 4 + record.tenancylength = 0 end - context "when tenancy length has not been answered" do - it "does not add an error" do - record.tenancylength = nil - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors).to be_empty - end + it "does not add errors" do + validation.call(record) + expect(record.errors).to be_empty end end end - context "when the collection start year is 2022 or later" do + context "when needs type is supported housing" do before do - Timecop.freeze(2022, 5, 1) + record.needstype = 2 + record.renttype = 1 + record.tenancy = 4 + record.tenancylength = 0 end - after do - Timecop.unfreeze + it "does not add errors" do + validation.call(record) + expect(record.errors).to be_empty end + end + end - let(:record) { FactoryBot.create(:lettings_log, startdate: Time.zone.local(2022, 5, 1), needstype: 1, rent_type: 1) } + describe "#validate_general_needs_fixed_tenancy_length_intermediate_rent" do + subject(:validation) { ->(record) { tenancy_validator.validate_general_needs_fixed_tenancy_length_intermediate_rent(record) } } - context "when type of tenancy is Secure - fixed term" do - let(:expected_error) do - I18n.t( - "validations.tenancy.length.secure", - min_tenancy_length: 2, - ) - end + context "when needs type is general needs" do + before { record.needstype = 1 } - before { record.tenancy = 6 } + context "and rent type is intermediate rent" do + before { record.renttype = 3 } - context "when tenancy length is less than 2" do - it "adds an error" do - record.tenancylength = 1 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) - end + error_fields = %w[needstype rent_type tenancylength tenancy] + fixed_term_tenancy_type_cases.each do |tenancy_type_case| + include_examples "adds expected errors based on the tenancy length", tenancy_type_case, error_fields, 1 end - context "when tenancy length is greater than 99" do - it "adds an error" do - record.tenancylength = 100 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) - end - end + include_examples "does not add errors when tenancy type is not fixed term" + end - context "when tenancy length is between 2-99" do - it "does not add an error" do - record.tenancylength = 3 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors).to be_empty - end + context "and rent type is not intermediate rent" do + before do + record.renttype = 2 + record.tenancy = 4 + record.tenancylength = 0 end - context "when tenancy length has not been answered" do - it "does not add an error" do - record.tenancylength = nil - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors).to be_empty - end + it "does not add errors" do + validation.call(record) + expect(record.errors).to be_empty end end + end - context "when type of tenancy is Secure - lifetime" do - let(:expected_error) do - I18n.t( - "validations.tenancy.length.secure", - min_tenancy_length: 2, - ) - end + context "when needs type is supported housing" do + before do + record.needstype = 2 + record.renttype = 3 + record.tenancy = 4 + record.tenancylength = 0 + end - before { record.tenancy = 7 } + it "does not add errors" do + validation.call(record) + expect(record.errors).to be_empty + end + end + end - context "when tenancy length is less than 2" do - it "adds an error" do - record.tenancylength = 1 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) - end - end + describe "#validate_periodic_tenancy_length" do + subject(:validation) { ->(record) { tenancy_validator.validate_periodic_tenancy_length(record) } } - context "when tenancy length is greater than 99" do - it "adds an error" do - record.tenancylength = 100 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) - end - end + periodic_tenancy_case = { + name: "periodic", + code: 8, + expected_error: ->(min_tenancy_length) { I18n.t("validations.tenancy.length.invalid_periodic", min_tenancy_length:) }, + } + error_fields = %w[tenancylength tenancy] + include_examples "adds expected errors based on the tenancy length", periodic_tenancy_case, error_fields, 1 - context "when tenancy length is between 2-99" do - it "does not add an error" do - record.tenancylength = 3 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors).to be_empty - end - end + context "when tenancy type is not periodic" do + before do + record.tenancy = 6 + record.tenancylength = 0 + end - context "when tenancy length has not been answered" do - it "does not add an error" do - record.tenancylength = nil - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors).to be_empty - end - end + it "does not add errors" do + validation.call(record) + expect(record.errors).to be_empty end + end - context "when type of tenancy is periodic" do - let(:expected_error) do - I18n.t( - "validations.tenancy.length.secure", - min_tenancy_length: 1, - ) - end + describe "#validate_tenancy_length_blank_when_not_required" do + context "when a tenancy length is provided" do + before { record.tenancylength = 10 } - before { record.tenancy = 8 } + context "and tenancy type is not fixed term or periodic" do + before { record.tenancy = 5 } - context "when tenancy length is less than 1" do - it "adds an error" do - record.tenancylength = 0 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) + it "adds errors to tenancylength and tenancy" do + tenancy_validator.validate_tenancy_length_blank_when_not_required(record) + expected_error = I18n.t("validations.tenancy.length.fixed_term_not_required") + expect(record.errors["tenancylength"]).to include(expected_error) + expect(record.errors["tenancy"]).to include(expected_error) end end - context "when tenancy length is greater than 99" do - it "adds an error" do - record.tenancylength = 100 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors["needstype"]).to include(match(expected_error)) - expect(record.errors["tenancylength"]).to include(match(expected_error)) - expect(record.errors["tenancy"]).to include(match(expected_error)) + tenancy_types_with_length = [ + { name: "assured shorthold", code: 4 }, + { name: "secure fixed term", code: 6 }, + { name: "periodic", code: 8 }, + ] + tenancy_types_with_length.each do |type| + context "and tenancy type is #{type[:name]}" do + before { record.tenancy = type[:code] } + + it "does not add errors" do + tenancy_validator.validate_tenancy_length_blank_when_not_required(record) + expect(record.errors).to be_empty + end end end + end - context "when tenancy length is between 2-99" do - it "does not add an error" do - record.tenancylength = 3 - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors).to be_empty - end + context "when tenancy length is not provided" do + before do + record.tenancylength = nil + record.tenancy = 5 end - context "when tenancy length has not been answered" do - it "does not add an error" do - record.tenancylength = nil - tenancy_validator.validate_fixed_term_tenancy(record) - expect(record.errors).to be_empty - end + it "does not add errors" do + tenancy_validator.validate_tenancy_length_blank_when_not_required(record) + expect(record.errors).to be_empty end end end @@ -284,6 +276,7 @@ RSpec.describe Validations::TenancyValidations do end describe "tenancy type validations" do + let(:record) { FactoryBot.create(:lettings_log, :setup_completed) } let(:field) { "validations.other_field_missing" } let(:main_field_label) { "tenancy type" } let(:other_field) { "tenancyother" } @@ -327,20 +320,11 @@ RSpec.describe Validations::TenancyValidations do describe "joint tenancy validation" do context "when the data inputter has said that there is only one member in the household" do - before do - Timecop.freeze(2022, 5, 1) - end - - after do - Timecop.unfreeze - end - - let(:record) { FactoryBot.create(:lettings_log, startdate: Time.zone.local(2022, 5, 1)) } + let(:record) { FactoryBot.create(:lettings_log, :setup_completed, hhmemb: 1) } let(:expected_error) { I18n.t("validations.tenancy.not_joint") } let(:hhmemb_expected_error) { I18n.t("validations.tenancy.joint_more_than_one_member") } it "displays an error if the data inputter says the letting is a joint tenancy" do - record.hhmemb = 1 record.joint = 1 tenancy_validator.validate_joint_tenancy(record) expect(record.errors["joint"]).to include(match(expected_error)) @@ -348,7 +332,6 @@ RSpec.describe Validations::TenancyValidations do end it "does not display an error if the data inputter says the letting is not a joint tenancy" do - record.hhmemb = 1 record.joint = 2 tenancy_validator.validate_joint_tenancy(record) expect(record.errors["joint"]).to be_empty @@ -356,7 +339,6 @@ RSpec.describe Validations::TenancyValidations do end it "does not display an error if the data inputter has given the household members but not input if it is a joint tenancy" do - record.hhmemb = 1 record.joint = nil tenancy_validator.validate_joint_tenancy(record) expect(record.errors["joint"]).to be_empty @@ -364,7 +346,6 @@ RSpec.describe Validations::TenancyValidations do end it "does not error when don't know answer to joint" do - record.hhmemb = 1 record.joint = 3 tenancy_validator.validate_joint_tenancy(record)