diff --git a/app/models/validations/tenancy_validations.rb b/app/models/validations/tenancy_validations.rb index e0fe67cac..456eff451 100644 --- a/app/models/validations/tenancy_validations.rb +++ b/app/models/validations/tenancy_validations.rb @@ -8,7 +8,7 @@ module Validations::TenancyValidations is_ast = record.tenancy == "Assured Shorthold" conditions = [ { condition: !(is_secure || is_ast) && is_present, error: I18n.t("validations.tenancy.length.fixed_term_not_required") }, - { condition: (is_ast && !is_in_range) && is_present, error: I18n.t("validations.tenancy.length.shorthold") }, + { condition: (is_ast && !is_in_range) && is_present, error: I18n.t("validations.tenancy.length.shorthold") }, { condition: is_secure && (!is_in_range && is_present), error: I18n.t("validations.tenancy.length.secure") }, ] diff --git a/spec/models/validations/tenancy_validations_spec.rb b/spec/models/validations/tenancy_validations_spec.rb index e7a09bb37..242a64883 100644 --- a/spec/models/validations/tenancy_validations_spec.rb +++ b/spec/models/validations/tenancy_validations_spec.rb @@ -14,7 +14,7 @@ RSpec.describe Validations::TenancyValidations do it "tenancy length should not be present" do record.tenancy = "Other" record.tenancylength = 10 - subject.validate_fixed_term_tenancy(record) + tenancy_validator.validate_fixed_term_tenancy(record) expect(record.errors["tenancylength"]).to include(match(expected_error)) expect(record.errors["tenancy"]).to include(match(expected_error)) end @@ -27,7 +27,7 @@ RSpec.describe Validations::TenancyValidations do it "adds an error" do record.tenancy = "Assured Shorthold" record.tenancylength = 1 - subject.validate_fixed_term_tenancy(record) + tenancy_validator.validate_fixed_term_tenancy(record) expect(record.errors["tenancylength"]).to include(match(expected_error)) expect(record.errors["tenancy"]).to include(match(expected_error)) end @@ -37,7 +37,7 @@ RSpec.describe Validations::TenancyValidations do it "adds an error" do record.tenancy = "Assured Shorthold" record.tenancylength = 100 - subject.validate_fixed_term_tenancy(record) + tenancy_validator.validate_fixed_term_tenancy(record) expect(record.errors["tenancylength"]).to include(match(expected_error)) expect(record.errors["tenancy"]).to include(match(expected_error)) end @@ -47,7 +47,7 @@ RSpec.describe Validations::TenancyValidations do it "does not add an error" do record.tenancy = "Assured Shorthold" record.tenancylength = 3 - subject.validate_fixed_term_tenancy(record) + tenancy_validator.validate_fixed_term_tenancy(record) expect(record.errors["tenancylength"]).to be_empty expect(record.errors["tenancy"]).to be_empty end @@ -57,7 +57,7 @@ RSpec.describe Validations::TenancyValidations do it "does not add an error" do record.tenancy = "Assured Shorthold" record.tenancylength = nil - subject.validate_fixed_term_tenancy(record) + tenancy_validator.validate_fixed_term_tenancy(record) expect(record.errors["tenancylength"]).to be_empty expect(record.errors["tenancy"]).to be_empty end @@ -71,7 +71,7 @@ RSpec.describe Validations::TenancyValidations do it "adds an error" do record.tenancy = "Secure (including flexible)" record.tenancylength = 1 - subject.validate_fixed_term_tenancy(record) + tenancy_validator.validate_fixed_term_tenancy(record) expect(record.errors["tenancylength"]).to include(match(expected_error)) expect(record.errors["tenancy"]).to include(match(expected_error)) end @@ -81,7 +81,7 @@ RSpec.describe Validations::TenancyValidations do it "adds an error" do record.tenancy = "Secure (including flexible)" record.tenancylength = 100 - subject.validate_fixed_term_tenancy(record) + tenancy_validator.validate_fixed_term_tenancy(record) expect(record.errors["tenancylength"]).to include(match(expected_error)) expect(record.errors["tenancy"]).to include(match(expected_error)) end @@ -91,7 +91,7 @@ RSpec.describe Validations::TenancyValidations do it "does not add an error" do record.tenancy = "Secure (including flexible)" record.tenancylength = 3 - subject.validate_fixed_term_tenancy(record) + tenancy_validator.validate_fixed_term_tenancy(record) expect(record.errors["tenancylength"]).to be_empty expect(record.errors["tenancy"]).to be_empty end @@ -101,7 +101,7 @@ RSpec.describe Validations::TenancyValidations do it "does not add an error" do record.tenancy = "Secure (including flexible)" record.tenancylength = nil - subject.validate_fixed_term_tenancy(record) + tenancy_validator.validate_fixed_term_tenancy(record) expect(record.errors["tenancylength"]).to be_empty expect(record.errors["tenancy"]).to be_empty end