6 files changed, 14 insertions, 9 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index b95c174d6e..7de259a60d 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -49,6 +49,7 @@ module ActiveModel
 
   eager_autoload do
     autoload :Errors
+    autoload :RangeError, 'active_model/errors'
     autoload :StrictValidationFailed, 'active_model/errors'
     autoload :UnknownAttributeError, 'active_model/errors'
   end
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index d106f65fa2..685e235730 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -526,6 +526,10 @@ module ActiveModel
   class StrictValidationFailed < StandardError
   end
 
+  # Raised when attribute values are out of range.
+  class RangeError < ::RangeError
+  end
+
   # Raised when unknown attributes are supplied via mass assignment.
   class UnknownAttributeError < NoMethodError
     attr_reader :record, :attribute
diff --git a/activemodel/lib/active_model/type/integer.rb b/activemodel/lib/active_model/type/integer.rb
index 2f73ede009..eea2280b22 100644
--- a/activemodel/lib/active_model/type/integer.rb
+++ b/activemodel/lib/active_model/type/integer.rb
@@ -46,7 +46,7 @@ module ActiveModel
 
       def ensure_in_range(value)
         unless range.cover?(value)
-          raise RangeError, "#{value} is out of range for #{self.class} with limit #{_limit}"
+          raise ActiveModel::RangeError, "#{value} is out of range for #{self.class} with limit #{_limit}"
         end
       end
 
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 26ba6ba4fb..fbf208836f 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -11,7 +11,7 @@ class ErrorsTest < ActiveModel::TestCase
     attr_reader   :errors
 
     def validate!
-      errors.add(:name, "cannot be nil") if name == nil
+      errors.add(:name, :blank, message: "cannot be nil") if name == nil
     end
 
     def read_attribute_for_validation(attr)
diff --git a/activemodel/test/cases/type/integer_test.rb b/activemodel/test/cases/type/integer_test.rb
index dac922db42..6603f25c9a 100644
--- a/activemodel/test/cases/type/integer_test.rb
+++ b/activemodel/test/cases/type/integer_test.rb
@@ -53,25 +53,25 @@ module ActiveModel
       end
 
       test "values below int min value are out of range" do
-        assert_raises(::RangeError) do
+        assert_raises(ActiveModel::RangeError) do
           Integer.new.serialize(-2147483649)
         end
       end
 
       test "values above int max value are out of range" do
-        assert_raises(::RangeError) do
+        assert_raises(ActiveModel::RangeError) do
           Integer.new.serialize(2147483648)
         end
       end
 
       test "very small numbers are out of range" do
-        assert_raises(::RangeError) do
+        assert_raises(ActiveModel::RangeError) do
           Integer.new.serialize(-9999999999999999999999999999999)
         end
       end
 
       test "very large numbers are out of range" do
-        assert_raises(::RangeError) do
+        assert_raises(ActiveModel::RangeError) do
           Integer.new.serialize(9999999999999999999999999999999)
         end
       end
@@ -96,10 +96,10 @@ module ActiveModel
 
         assert_equal(9223372036854775807, type.serialize(9223372036854775807))
         assert_equal(-9223372036854775808, type.serialize(-9223372036854775808))
-        assert_raises(::RangeError) do
+        assert_raises(ActiveModel::RangeError) do
           type.serialize(-9999999999999999999999999999999)
         end
-        assert_raises(::RangeError) do
+        assert_raises(ActiveModel::RangeError) do
           type.serialize(9999999999999999999999999999999)
         end
       end
diff --git a/activemodel/test/cases/type/unsigned_integer_test.rb b/activemodel/test/cases/type/unsigned_integer_test.rb
index 16301b3ac0..026cb08a06 100644
--- a/activemodel/test/cases/type/unsigned_integer_test.rb
+++ b/activemodel/test/cases/type/unsigned_integer_test.rb
@@ -9,7 +9,7 @@ module ActiveModel
       end
 
       test "minus value is out of range" do
-        assert_raises(::RangeError) do
+        assert_raises(ActiveModel::RangeError) do
           UnsignedInteger.new.serialize(-1)
         end
       end