diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb index 03a543ad8..0d1be05ae 100644 --- a/spec/models/validations/household_validations_spec.rb +++ b/spec/models/validations/household_validations_spec.rb @@ -332,8 +332,12 @@ RSpec.describe Validations::HouseholdValidations do record.relat2 = "P" record.relat3 = "P" household_validator.validate_household_number_of_other_members(record) - expect(record.errors["base"]) + expect(record.errors["relat2"]) .to include(match I18n.t("validations.household.relat.one_partner")) + expect(record.errors["relat3"]) + .to include(match I18n.t("validations.household.relat.one_partner")) + expect(record.errors["relat4"]) + .not_to include(match I18n.t("validations.household.relat.one_partner")) end it "expects that a tenant can have a partner" do diff --git a/spec/models/validations/sales/household_validations_spec.rb b/spec/models/validations/sales/household_validations_spec.rb index 1ba7eb7f3..bfbae6fda 100644 --- a/spec/models/validations/sales/household_validations_spec.rb +++ b/spec/models/validations/sales/household_validations_spec.rb @@ -49,8 +49,12 @@ RSpec.describe Validations::Sales::HouseholdValidations do record.relat2 = "P" record.relat3 = "P" household_validator.validate_household_number_of_other_members(record) - expect(record.errors["base"]) + expect(record.errors["relat2"]) .to include(match I18n.t("validations.household.relat.one_partner")) + expect(record.errors["relat3"]) + .to include(match I18n.t("validations.household.relat.one_partner")) + expect(record.errors["relat4"]) + .not_to include(match I18n.t("validations.household.relat.one_partner")) end it "expects that a tenant can have a partner" do @@ -68,38 +72,37 @@ RSpec.describe Validations::Sales::HouseholdValidations do expect(record.errors["age2"]).to be_empty end - it "validates that a person under 16 must not be a partner of the buyer" do - record.age2 = 14 - record.relat2 = "P" - household_validator.validate_household_number_of_other_members(record) - expect(record.errors["relat2"]) - .to include(match I18n.t("validations.household.relat.partner_under_16")) - expect(record.errors["age2"]) - .to include(match I18n.t("validations.household.age.partner_under_16")) - end + it "validates that a person under 16 must not be a partner of the buyer" + record.age2 = 14 + record.relat2 = "P" + household_validator.validate_household_number_of_other_members(record) + expect(record.errors["relat2"]) + .to include(match I18n.t("validations.household.relat.partner_under_16")) + expect(record.errors["age2"]) + .to include(match I18n.t("validations.household.age.partner_under_16")) + end - it "validates that a person over 20 must not be a child of the buyer" do - record.age2 = 21 - record.relat2 = "C" - household_validator.validate_household_number_of_other_members(record) - expect(record.errors["relat2"]) - .to include(match I18n.t("validations.household.relat.child_over_20")) - expect(record.errors["age2"]) - .to include(match I18n.t("validations.household.age.child_over_20")) - end + it "validates that a person over 20 must not be a child of the buyer" do + record.age2 = 21 + record.relat2 = "C" + household_validator.validate_household_number_of_other_members(record) + expect(record.errors["relat2"]) + .to include(match I18n.t("validations.household.relat.child_over_20")) + expect(record.errors["age2"]) + .to include(match I18n.t("validations.household.age.child_over_20")) + end - it "validates that a person aged 16-19 who is a student must be a child of the buyer" do - record.age2 = 18 - record.ecstat2 = "7" - record.relat2 = "P" - household_validator.validate_household_number_of_other_members(record) - expect(record.errors["relat2"]) - .to include(match I18n.t("validations.household.relat.student_16_19")) - expect(record.errors["age2"]) - .to include(match I18n.t("validations.household.age.student_16_19")) - expect(record.errors["ecstat2"]) - .to include(match I18n.t("validations.household.ecstat.student_16_19")) - end + it "validates that a person aged 16-19 who is a student must be a child of the buyer" do + record.age2 = 18 + record.ecstat2 = "7" + record.relat2 = "P" + household_validator.validate_household_number_of_other_members(record) + expect(record.errors["relat2"]) + .to include(match I18n.t("validations.household.relat.student_16_19")) + expect(record.errors["age2"]) + .to include(match I18n.t("validations.household.age.student_16_19")) + expect(record.errors["ecstat2"]) + .to include(match I18n.t("validations.household.ecstat.student_16_19")) end end end