baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Name subject

pull/296/head
baarkerlounger 3 years ago
parent
1a4a4dfdb2
commit
0108ad2a2f
2 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/models/validations/tenancy_validations.rb
  2. 18
      spec/models/validations/tenancy_validations_spec.rb

2
app/models/validations/tenancy_validations.rb
Unescape View File

@ -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") },
]

18
spec/models/validations/tenancy_validations_spec.rb
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save