8 files changed, 93 insertions, 6 deletions
diff --git a/activemodel/test/cases/attribute_assignment_test.rb b/activemodel/test/cases/attribute_assignment_test.rb
index 3336691841..287bea719c 100644
--- a/activemodel/test/cases/attribute_assignment_test.rb
+++ b/activemodel/test/cases/attribute_assignment_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+require "active_support/core_ext/hash/indifferent_access"
 require "active_support/hash_with_indifferent_access"
 
 class AttributeAssignmentTest < ActiveModel::TestCase
@@ -23,13 +24,32 @@ class AttributeAssignmentTest < ActiveModel::TestCase
   class ErrorFromAttributeWriter < StandardError
   end
 
-  class ProtectedParams < ActiveSupport::HashWithIndifferentAccess
+  class ProtectedParams
+    attr_accessor :permitted
+    alias :permitted? :permitted
+
+    delegate :keys, :key?, :has_key?, :empty?, to: :@parameters
+
+    def initialize(attributes)
+      @parameters = attributes.with_indifferent_access
+      @permitted = false
+    end
+
     def permit!
       @permitted = true
+      self
+    end
+
+    def [](key)
+      @parameters[key]
+    end
+
+    def to_h
+      @parameters
     end
 
-    def permitted?
-      @permitted ||= false
+    def stringify_keys
+      dup
     end
 
     def dup
diff --git a/activemodel/test/cases/callbacks_test.rb b/activemodel/test/cases/callbacks_test.rb
index 85455c112c..e4ecc0adb4 100644
--- a/activemodel/test/cases/callbacks_test.rb
+++ b/activemodel/test/cases/callbacks_test.rb
@@ -28,7 +28,7 @@ class CallbacksTest < ActiveModel::TestCase
       false
     end
 
-    after_create "@callbacks << :final_callback"
+    ActiveSupport::Deprecation.silence { after_create "@callbacks << :final_callback" }
 
     def initialize(options = {})
       @callbacks = []
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index f6d171bec6..a5ac055033 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -410,4 +410,14 @@ class ErrorsTest < ActiveModel::TestCase
     person.errors.clear
     assert person.errors.details.empty?
   end
+
+  test "copy errors" do
+    errors = ActiveModel::Errors.new(Person.new)
+    errors.add(:name, :invalid)
+    person = Person.new
+    person.errors.copy!(errors)
+
+    assert_equal [:name], person.errors.messages.keys
+    assert_equal [:name], person.errors.details.keys
+  end
 end
diff --git a/activemodel/test/cases/forbidden_attributes_protection_test.rb b/activemodel/test/cases/forbidden_attributes_protection_test.rb
index 3cb204a2c5..d8d757f52a 100644
--- a/activemodel/test/cases/forbidden_attributes_protection_test.rb
+++ b/activemodel/test/cases/forbidden_attributes_protection_test.rb
@@ -2,12 +2,14 @@ require 'cases/helper'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'models/account'
 
-class ProtectedParams < ActiveSupport::HashWithIndifferentAccess
+class ProtectedParams
   attr_accessor :permitted
   alias :permitted? :permitted
 
+  delegate :keys, :key?, :has_key?, :empty?, to: :@parameters
+
   def initialize(attributes)
-    super(attributes)
+    @parameters = attributes
     @permitted = false
   end
 
@@ -15,6 +17,10 @@ class ProtectedParams < ActiveSupport::HashWithIndifferentAccess
     @permitted = true
     self
   end
+
+  def to_h
+    @parameters
+  end
 end
 
 class ActiveModelMassUpdateProtectionTest < ActiveSupport::TestCase
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index cedc812ec7..2c89388f14 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -88,6 +88,11 @@ class ActiveModelI18nTests < ActiveModel::TestCase
     assert_equal 'child model', Child.model_name.human
   end
 
+  def test_translated_model_with_namespace
+    I18n.backend.store_translations 'en', activemodel: { models: { 'person/gender': 'gender model' } }
+    assert_equal 'gender model', Person::Gender.model_name.human
+  end
+
   def test_translated_model_names_with_ancestors_fallback
     I18n.backend.store_translations 'en', activemodel: { models: { person: 'person model' } }
     assert_equal 'person model', Child.model_name.human
diff --git a/activemodel/test/cases/types_test.rb b/activemodel/test/cases/types_test.rb
index f937208580..558c56f157 100644
--- a/activemodel/test/cases/types_test.rb
+++ b/activemodel/test/cases/types_test.rb
@@ -64,6 +64,9 @@ module ActiveModel
 
       time_string = Time.now.utc.strftime("%T")
       assert_equal time_string, type.cast(time_string).strftime("%T")
+
+      assert_equal ::Time.utc(2000,  1,  1, 16, 45, 54), type.cast('2015-06-13T19:45:54+03:00')
+      assert_equal ::Time.utc(1999, 12, 31, 21,  7,  8), type.cast('06:07:08+09:00')
     end
 
     def test_type_cast_datetime_and_timestamp
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index 04ec74bad3..74a048537d 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -79,6 +79,13 @@ class NumericalityValidationTest < ActiveModel::TestCase
     valid!([97.18, 98, BigDecimal.new('98')]) # Notice the 97.18 as a float is greater than 97.18 as a BigDecimal due to floating point precision
   end
 
+  def test_validates_numericality_with_greater_than_using_string_value
+    Topic.validates_numericality_of :approved, greater_than: 10
+
+    invalid!(['-10', '9', '9.9', '10'], 'must be greater than 10')
+    valid!(['10.1', '11'])
+  end
+
   def test_validates_numericality_with_greater_than_or_equal
     Topic.validates_numericality_of :approved, greater_than_or_equal_to: 10
 
@@ -93,6 +100,13 @@ class NumericalityValidationTest < ActiveModel::TestCase
     valid!([97.18, 98, BigDecimal.new('97.19')])
   end
 
+  def test_validates_numericality_with_greater_than_or_equal_using_string_value
+    Topic.validates_numericality_of :approved, greater_than_or_equal_to: 10
+
+    invalid!(['-10', '9', '9.9'], 'must be greater than or equal to 10')
+    valid!(['10', '10.1', '11'])
+  end
+
   def test_validates_numericality_with_equal_to
     Topic.validates_numericality_of :approved, equal_to: 10
 
@@ -107,6 +121,13 @@ class NumericalityValidationTest < ActiveModel::TestCase
     valid!([BigDecimal.new('97.18')])
   end
 
+  def test_validates_numericality_with_equal_to_using_string_value
+    Topic.validates_numericality_of :approved, equal_to: 10
+
+    invalid!(['-10', '9', '9.9', '10.1', '11'], 'must be equal to 10')
+    valid!(['10'])
+  end
+
   def test_validates_numericality_with_less_than
     Topic.validates_numericality_of :approved, less_than: 10
 
@@ -121,6 +142,13 @@ class NumericalityValidationTest < ActiveModel::TestCase
     valid!([-97.0, 97.0, -97, 97, BigDecimal.new('-97'), BigDecimal.new('97')])
   end
 
+  def test_validates_numericality_with_less_than_using_string_value
+    Topic.validates_numericality_of :approved, less_than: 10
+
+    invalid!(['10', '10.1', '11'], 'must be less than 10')
+    valid!(['-10', '9', '9.9'])
+  end
+
   def test_validates_numericality_with_less_than_or_equal_to
     Topic.validates_numericality_of :approved, less_than_or_equal_to: 10
 
@@ -135,6 +163,13 @@ class NumericalityValidationTest < ActiveModel::TestCase
     valid!([-97.18, BigDecimal.new('-97.18'), BigDecimal.new('97.18')])
   end
 
+  def test_validates_numericality_with_less_than_or_equal_using_string_value
+    Topic.validates_numericality_of :approved, less_than_or_equal_to: 10
+
+    invalid!(['10.1', '11'], 'must be less than or equal to 10')
+    valid!(['-10', '9', '9.9', '10'])
+  end
+
   def test_validates_numericality_with_odd
     Topic.validates_numericality_of :approved, odd: true
 
@@ -163,6 +198,13 @@ class NumericalityValidationTest < ActiveModel::TestCase
     valid!([-1, 42])
   end
 
+  def test_validates_numericality_with_other_than_using_string_value
+    Topic.validates_numericality_of :approved, other_than: 0
+
+    invalid!(['0', '0.0'])
+    valid!(['-1', '1.1', '42'])
+  end
+
   def test_validates_numericality_with_proc
     Topic.send(:define_method, :min_approved, lambda { 5 })
     Topic.validates_numericality_of :approved, greater_than_or_equal_to: Proc.new(&:min_approved)
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 03c7943308..c73580138d 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -101,6 +101,7 @@ class ValidatesWithTest < ActiveModel::TestCase
     validator.expect(:new, validator, [{foo: :bar, if: "1 == 1", class: Topic}])
     validator.expect(:validate, nil, [topic])
     validator.expect(:is_a?, false, [Symbol])
+    validator.expect(:is_a?, false, [String])
 
     Topic.validates_with(validator, if: "1 == 1", foo: :bar)
     assert topic.valid?