Merge remote-tracking branch 'upstream/pull/2802'

[rails.git] / app / validators / whitespace_validator.rb

diff --git a/app/validators/whitespace_validator.rb b/app/validators/whitespace_validator.rb
index d177df92a6c5979f715a705aae27e63ffa58aa3f..333ad0e05f76a327fb53e72fa168ea267b6ccea2 100644 (file)
--- a/app/validators/whitespace_validator.rb
+++ b/app/validators/whitespace_validator.rb
@@ -1,11 +1,11 @@
 class WhitespaceValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless options.fetch(:leading, true)
-      record.errors[attribute] << (options[:message] || I18n.t("validations.leading_whitespace")) if value =~ /\A\s/
+      record.errors[attribute] << (options[:message] || I18n.t("validations.leading_whitespace")) if /\A\s/.match?(value)
     end
 
     unless options.fetch(:trailing, true)
-      record.errors[attribute] << (options[:message] || I18n.t("validations.trailing_whitespace")) if value =~ /\s\z/
+      record.errors[attribute] << (options[:message] || I18n.t("validations.trailing_whitespace")) if /\s\z/.match?(value)
     end
   end
 end