From acf1bcf962f13a0e90b0ef7a9b0c93062b70c5de Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Fri, 2 Aug 2024 16:29:03 +0100 Subject: [PATCH] Fix managing org question id --- app/models/validations/financial_validations.rb | 2 +- spec/models/validations/financial_validations_spec.rb | 2 +- spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/validations/financial_validations.rb b/app/models/validations/financial_validations.rb index 9b6236029..53e50a92f 100644 --- a/app/models/validations/financial_validations.rb +++ b/app/models/validations/financial_validations.rb @@ -153,7 +153,7 @@ module Validations::FinancialValidations org_name: record.managing_organisation.name, rent_period: record.form.get_question("period", record).label_from_value(record.period).downcase, ) - record.errors.add :managing_organisation, :skip_bu_error, message: I18n.t( + record.errors.add :managing_organisation_id, :skip_bu_error, message: I18n.t( "validations.financial.rent_period.invalid_for_org.managing_org", org_name: record.managing_organisation.name, rent_period: record.form.get_question("period", record).label_from_value(record.period).downcase, diff --git a/spec/models/validations/financial_validations_spec.rb b/spec/models/validations/financial_validations_spec.rb index a96f895f3..a6eefa708 100644 --- a/spec/models/validations/financial_validations_spec.rb +++ b/spec/models/validations/financial_validations_spec.rb @@ -169,7 +169,7 @@ RSpec.describe Validations::FinancialValidations do org_name: user.organisation.name, rent_period: "every 4 weeks", )) - expect(record.errors["managing_organisation"]) + expect(record.errors["managing_organisation_id"]) .to include(match I18n.t( "validations.financial.rent_period.invalid_for_org.managing_org", org_name: user.organisation.name, diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb index 89ab07e79..7cae5eeae 100644 --- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb @@ -758,7 +758,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do it "does not add that error" do parser.valid? - expect(parser.log.errors.map(&:attribute).sort).to eql(%i[managing_organisation period]) + expect(parser.log.errors.map(&:attribute).sort).to eql(%i[managing_organisation_id period]) expect(parser.errors.map(&:attribute)).to eql(%i[field_123]) end end