From 58baf8b45b86b73ba6cc7cd7c3a0d8d246e40d5e Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Wed, 8 Mar 2023 10:37:20 +0000 Subject: [PATCH] setup errors always added - no longer observes if the grouping already has errors - as we have fine grain control in this class of how errors should be --- app/services/bulk_upload/lettings/row_parser.rb | 2 +- spec/services/bulk_upload/lettings/row_parser_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/bulk_upload/lettings/row_parser.rb b/app/services/bulk_upload/lettings/row_parser.rb index 2c2dbce56..89fb0d828 100644 --- a/app/services/bulk_upload/lettings/row_parser.rb +++ b/app/services/bulk_upload/lettings/row_parser.rb @@ -414,7 +414,7 @@ private if setup_question?(question) fields.each do |field| - unless errors.any? { |e| fields.include?(e.attribute) } + if errors[field].present? errors.add(field, I18n.t("validations.not_answered", question: question.check_answer_label&.downcase), category: :setup) end end diff --git a/spec/services/bulk_upload/lettings/row_parser_spec.rb b/spec/services/bulk_upload/lettings/row_parser_spec.rb index b61d388f8..e26bfd10e 100644 --- a/spec/services/bulk_upload/lettings/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/row_parser_spec.rb @@ -218,7 +218,7 @@ RSpec.describe BulkUpload::Lettings::RowParser do it "has errors on setup fields" do errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute) - expect(errors).to eql(%i[field_1 field_129 field_130 field_98 field_97 field_96 field_111 field_113]) + expect(errors).to eql(%i[field_1 field_98 field_97 field_96 field_111 field_113]) end end