aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2019-01-30 23:49:24 +0100
committerGitHub <noreply@github.com>2019-01-30 23:49:24 +0100
commite01e64628d237ca3be2210b1b0caeee99f2fb09d (patch)
tree780ee167f918849ea1ebbd6b8c9b2ca74577148d
parent6729cef7516207efa1980de65fb4e1c72b4376d1 (diff)
parent8b66ea5d2cf754b0b2ad26db3ccfbbb0b7e4da85 (diff)
downloadrails-e01e64628d237ca3be2210b1b0caeee99f2fb09d.tar.gz
rails-e01e64628d237ca3be2210b1b0caeee99f2fb09d.tar.bz2
rails-e01e64628d237ca3be2210b1b0caeee99f2fb09d.zip
Merge pull request #35104 from alkesh26/activemodel-typo-fixes
ActiveModel typo fixes.
-rw-r--r--activemodel/lib/active_model/validations/length.rb2
-rw-r--r--activemodel/test/cases/validations/numericality_validation_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb
index d6c80b2c5d..02759b4ccb 100644
--- a/activemodel/lib/active_model/validations/length.rb
+++ b/activemodel/lib/active_model/validations/length.rb
@@ -32,7 +32,7 @@ module ActiveModel
value = options[key]
unless (value.is_a?(Integer) && value >= 0) || value == Float::INFINITY || value.is_a?(Symbol) || value.is_a?(Proc)
- raise ArgumentError, ":#{key} must be a nonnegative Integer, Infinity, Symbol, or Proc"
+ raise ArgumentError, ":#{key} must be a non-negative Integer, Infinity, Symbol, or Proc"
end
end
end
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index fcdf123062..16c44762cb 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -281,7 +281,7 @@ class NumericalityValidationTest < ActiveModel::TestCase
assert_predicate topic, :invalid?
end
- def test_validates_numericalty_with_object_acting_as_numeric
+ def test_validates_numericality_with_object_acting_as_numeric
klass = Class.new do
def to_f
123.54