diff --git a/app/validations/date_validations.rb b/app/validations/date_validations.rb index fa8de9849..c5073cc40 100644 --- a/app/validations/date_validations.rb +++ b/app/validations/date_validations.rb @@ -8,7 +8,7 @@ module DateValidations record["rsnvac"] == "First let of conversion/rehabilitation/acquired property" || record["rsnvac"] == "First let of leased property") && record["mrcdate"].present? - record.errors.add :mrcdate, "Major repairs date must be before the tenancy start date" + record.errors.add :mrcdate, "Major repairs date must not be completed if the tenancy is first let" end if record["mrcdate"].present? && record["startdate"].present? && record["startdate"].to_date - record["mrcdate"].to_date > 730 diff --git a/spec/fixtures/complete_case_log.json b/spec/fixtures/complete_case_log.json index 06c5cd0bb..88e72fc34 100644 --- a/spec/fixtures/complete_case_log.json +++ b/spec/fixtures/complete_case_log.json @@ -50,7 +50,7 @@ "accessibility_requirements": "No", "condition_effects": "dummy", "tenancy_code": "BZ757", - "startdate": "12/03/2020", + "startdate": "12/12/2020", "startertenancy": "No", "tenancylength": "5", "tenancy": "Secure (including flexible)", @@ -59,17 +59,17 @@ "la": "Barnet", "property_postcode": "NW1 5TY", "property_relet": "No", - "rsnvac": "First let of newbuild property", + "rsnvac": "Renewal of fixed-term tenancy", "property_reference": "P9876", "unittype_gn": "House", "property_building_type": "dummy", "beds": 3, - "property_void_date": "03/11/2019", + "property_void_date": "10/10/2020", "majorrepairs": "Yes", - "mrcdate": "12/02/2020", - "mrcday": 12, - "mrcmonth": 2, - "mrcyear": 2019, + "mrcdate": "11/11/2020", + "mrcday": 11, + "mrcmonth": 11, + "mrcyear": 2020, "offered": 2, "wchair": "Yes", "net_income_known": "Yes", diff --git a/spec/requests/case_log_controller_spec.rb b/spec/requests/case_log_controller_spec.rb index eb8b9c9c9..c8021bc17 100644 --- a/spec/requests/case_log_controller_spec.rb +++ b/spec/requests/case_log_controller_spec.rb @@ -84,6 +84,7 @@ RSpec.describe CaseLogsController, type: :request do it "marks the record as completed" do json_response = JSON.parse(response.body) + expect(json_response).not_to have_key("errors") expect(json_response["status"]).to eq(completed) end end