From 6f70c13062cb4375368b32de5a0e5dc6052b94be Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 17 Mar 2021 17:02:32 +0000 Subject: [PATCH] Use .add method for adding errors This avoids a deprecation warning on rails 6.1 --- app/validators/characters_validator.rb | 4 ++-- app/validators/whitespace_validator.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/validators/characters_validator.rb b/app/validators/characters_validator.rb index 837e3e6cc..13d08ca55 100644 --- a/app/validators/characters_validator.rb +++ b/app/validators/characters_validator.rb @@ -3,7 +3,7 @@ class CharactersValidator < ActiveModel::EachValidator INVALID_URL_CHARS = "/;.,?%#".freeze def validate_each(record, attribute, value) - record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_characters")) if /[#{INVALID_CHARS}]/o.match?(value) - record.errors[attribute] << (options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if options[:url_safe] && /[#{INVALID_URL_CHARS}]/o.match?(value) + record.errors.add(attribute, options[:message] || I18n.t("validations.invalid_characters")) if /[#{INVALID_CHARS}]/o.match?(value) + record.errors.add(attribute, options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if options[:url_safe] && /[#{INVALID_URL_CHARS}]/o.match?(value) end end diff --git a/app/validators/whitespace_validator.rb b/app/validators/whitespace_validator.rb index 3032c109e..6453742c2 100644 --- a/app/validators/whitespace_validator.rb +++ b/app/validators/whitespace_validator.rb @@ -1,6 +1,6 @@ class WhitespaceValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) - record.errors[attribute] << (options[:message] || I18n.t("validations.leading_whitespace")) if !options.fetch(:leading, true) && /\A\s/.match?(value) - record.errors[attribute] << (options[:message] || I18n.t("validations.trailing_whitespace")) if !options.fetch(:trailing, true) && /\s\z/.match?(value) + record.errors.add(attribute, options[:message] || I18n.t("validations.leading_whitespace")) if !options.fetch(:leading, true) && /\A\s/.match?(value) + record.errors.add(attribute, options[:message] || I18n.t("validations.trailing_whitespace")) if !options.fetch(:trailing, true) && /\s\z/.match?(value) end end -- 2.43.2