1 files changed, 43 insertions, 23 deletions

diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 9cfba9812b..da142ea2c0 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -29,28 +29,28 @@ class ErrorsTest < ActiveModel::TestCase
 
   def test_delete
     errors = ActiveModel::Errors.new(self)
-    errors[:foo] = 'omg'
+    errors[:foo] << 'omg'
     errors.delete(:foo)
     assert_empty errors[:foo]
   end
 
   def test_include?
     errors = ActiveModel::Errors.new(self)
-    errors[:foo] = 'omg'
+    errors[:foo] << 'omg'
     assert errors.include?(:foo), 'errors should include :foo'
   end
 
   def test_dup
     errors = ActiveModel::Errors.new(self)
-    errors[:foo] = 'bar'
+    errors[:foo] << 'bar'
     errors_dup = errors.dup
-    errors_dup[:bar] = 'omg'
+    errors_dup[:bar] << 'omg'
     assert_not_same errors_dup.messages, errors.messages
   end
 
   def test_has_key?
     errors = ActiveModel::Errors.new(self)
-    errors[:foo] = 'omg'
+    errors[:foo] << 'omg'
     assert_equal true, errors.has_key?(:foo), 'errors should have key :foo'
   end
 
@@ -61,7 +61,7 @@ class ErrorsTest < ActiveModel::TestCase
 
   def test_key?
     errors = ActiveModel::Errors.new(self)
-    errors[:foo] = 'omg'
+    errors[:foo] << 'omg'
     assert_equal true, errors.key?(:foo), 'errors should have key :foo'
   end
 
@@ -81,37 +81,41 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "get returns the errors for the provided key" do
     errors = ActiveModel::Errors.new(self)
-    errors[:foo] = "omg"
+    errors[:foo] << "omg"
 
-    assert_equal ["omg"], errors.get(:foo)
+    assert_deprecated do
+      assert_equal ["omg"], errors.get(:foo)
+    end
   end
 
   test "sets the error with the provided key" do
     errors = ActiveModel::Errors.new(self)
-    errors.set(:foo, "omg")
+    assert_deprecated do
+      errors.set(:foo, "omg")
+    end
 
     assert_equal({ foo: "omg" }, errors.messages)
   end
 
   test "error access is indifferent" do
     errors = ActiveModel::Errors.new(self)
-    errors[:foo] = "omg"
+    errors[:foo] << "omg"
 
     assert_equal ["omg"], errors["foo"]
   end
 
   test "values returns an array of messages" do
     errors = ActiveModel::Errors.new(self)
-    errors.set(:foo, "omg")
-    errors.set(:baz, "zomg")
+    errors.messages[:foo] = "omg"
+    errors.messages[:baz] = "zomg"
 
     assert_equal ["omg", "zomg"], errors.values
   end
 
   test "keys returns the error keys" do
     errors = ActiveModel::Errors.new(self)
-    errors.set(:foo, "omg")
-    errors.set(:baz, "zomg")
+    errors.messages[:foo] << "omg"
+    errors.messages[:baz] << "zomg"
 
     assert_equal [:foo, :baz], errors.keys
   end
@@ -133,7 +137,9 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "assign error" do
     person = Person.new
-    person.errors[:name] = 'should not be nil'
+    assert_deprecated do
+      person.errors[:name] = 'should not be nil'
+    end
     assert_equal ["should not be nil"], person.errors[:name]
   end
 
@@ -282,46 +288,60 @@ class ErrorsTest < ActiveModel::TestCase
   test "add_on_empty generates message" do
     person = Person.new
     person.errors.expects(:generate_message).with(:name, :empty, {})
-    person.errors.add_on_empty :name
+    assert_deprecated do
+      person.errors.add_on_empty :name
+    end
   end
 
   test "add_on_empty generates message for multiple attributes" do
     person = Person.new
     person.errors.expects(:generate_message).with(:name, :empty, {})
     person.errors.expects(:generate_message).with(:age, :empty, {})
-    person.errors.add_on_empty [:name, :age]
+    assert_deprecated do
+      person.errors.add_on_empty [:name, :age]
+    end
   end
 
   test "add_on_empty generates message with custom default message" do
     person = Person.new
     person.errors.expects(:generate_message).with(:name, :empty, { message: 'custom' })
-    person.errors.add_on_empty :name, message: 'custom'
+    assert_deprecated do
+      person.errors.add_on_empty :name, message: 'custom'
+    end
   end
 
   test "add_on_empty generates message with empty string value" do
     person = Person.new
     person.name = ''
     person.errors.expects(:generate_message).with(:name, :empty, {})
-    person.errors.add_on_empty :name
+    assert_deprecated do
+      person.errors.add_on_empty :name
+    end
   end
 
   test "add_on_blank generates message" do
     person = Person.new
     person.errors.expects(:generate_message).with(:name, :blank, {})
-    person.errors.add_on_blank :name
+    assert_deprecated do
+      person.errors.add_on_blank :name
+    end
   end
 
   test "add_on_blank generates message for multiple attributes" do
     person = Person.new
     person.errors.expects(:generate_message).with(:name, :blank, {})
     person.errors.expects(:generate_message).with(:age, :blank, {})
-    person.errors.add_on_blank [:name, :age]
+    assert_deprecated do
+      person.errors.add_on_blank [:name, :age]
+    end
   end
 
   test "add_on_blank generates message with custom default message" do
     person = Person.new
     person.errors.expects(:generate_message).with(:name, :blank, { message: 'custom' })
-    person.errors.add_on_blank :name, message: 'custom'
+    assert_deprecated do
+      person.errors.add_on_blank :name, message: 'custom'
+    end
   end
 
   test "details returns added error detail" do
@@ -347,7 +367,7 @@ class ErrorsTest < ActiveModel::TestCase
     errors.add(:name, :invalid)
     errors_dup = errors.dup
     errors_dup.add(:name, :taken)
-    assert_not_same errors_dup.details, errors.details
+    assert_not_equal errors_dup.details, errors.details
   end
 
   test "delete removes details on given attribute" do