1 files changed, 36 insertions, 23 deletions
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index f781a0017f..f6d171bec6 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -149,6 +149,12 @@ class ErrorsTest < ActiveModel::TestCase
     assert_equal ["cannot be blank"], person.errors[:name]
   end
 
+  test "add an error message on a specific attribute with a defined type" do
+    person = Person.new
+    person.errors.add(:name, :blank, message: "cannot be blank")
+    assert_equal ["cannot be blank"], person.errors[:name]
+  end
+
   test "add an error with a symbol" do
     person = Person.new
     person.errors.add(:name, :blank)
@@ -293,60 +299,67 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "add_on_empty generates message" do
     person = Person.new
-    person.errors.expects(:generate_message).with(:name, :empty, {})
-    assert_deprecated do
-      person.errors.add_on_empty :name
+    assert_called_with(person.errors, :generate_message, [:name, :empty, {}]) do
+      assert_deprecated do
+        person.errors.add_on_empty :name
+      end
     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, {})
-    assert_deprecated do
-      person.errors.add_on_empty [:name, :age]
+    expected_calls = [ [:name, :empty, {}], [:age, :empty, {}] ]
+    assert_called_with(person.errors, :generate_message, expected_calls) do
+      assert_deprecated do
+        person.errors.add_on_empty [:name, :age]
+      end
     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' })
-    assert_deprecated do
-      person.errors.add_on_empty :name, message: 'custom'
+    assert_called_with(person.errors, :generate_message, [:name, :empty, { message: 'custom' }]) do
+      assert_deprecated do
+        person.errors.add_on_empty :name, message: 'custom'
+      end
     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, {})
-    assert_deprecated do
-      person.errors.add_on_empty :name
+    assert_called_with(person.errors, :generate_message, [:name, :empty, {}]) do
+      assert_deprecated do
+        person.errors.add_on_empty :name
+      end
     end
   end
 
   test "add_on_blank generates message" do
     person = Person.new
-    person.errors.expects(:generate_message).with(:name, :blank, {})
-    assert_deprecated do
-      person.errors.add_on_blank :name
+    assert_called_with(person.errors, :generate_message, [:name, :blank, {}]) do
+      assert_deprecated do
+        person.errors.add_on_blank :name
+      end
     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, {})
-    assert_deprecated do
-      person.errors.add_on_blank [:name, :age]
+    expected_calls = [ [:name, :blank, {}], [:age, :blank, {}] ]
+    assert_called_with(person.errors, :generate_message, expected_calls) do
+      assert_deprecated do
+        person.errors.add_on_blank [:name, :age]
+      end
     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' })
-    assert_deprecated do
-      person.errors.add_on_blank :name, message: 'custom'
+    assert_called_with(person.errors, :generate_message, [:name, :blank, { message: 'custom' }]) do
+      assert_deprecated do
+        person.errors.add_on_blank :name, message: 'custom'
+      end
     end
   end