1 files changed, 45 insertions, 23 deletions
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index d10c20caad..3fa63917d0 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -27,6 +27,14 @@ class ErrorsTest < ActiveModel::TestCase
     end
   end
 
+  def setup
+    @mock_generator = MiniTest::Mock.new
+  end
+
+  def teardown
+    @mock_generator.verify
+  end
+
   def test_delete
     errors = ActiveModel::Errors.new(self)
     errors[:foo] << 'omg'
@@ -299,60 +307,74 @@ 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
+    @mock_generator.expect(:call, nil, [:name, :empty, {}])
+    person.errors.stub(:generate_message, @mock_generator) 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]
+    @mock_generator.expect(:call, nil, [:name, :empty, {}])
+    @mock_generator.expect(:call, nil, [:age, :empty, {}])
+    person.errors.stub(:generate_message, @mock_generator) 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'
+    @mock_generator.expect(:call, nil, [:name, :empty, { message: 'custom' }])
+    person.errors.stub(:generate_message, @mock_generator) 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
+    @mock_generator.expect(:call, nil, [:name, :empty, {}])
+    person.errors.stub(:generate_message, @mock_generator) 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
+    @mock_generator.expect(:call, nil, [:name, :blank, {}])
+    person.errors.stub(:generate_message, @mock_generator) 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]
+    @mock_generator.expect(:call, nil, [:name, :blank, {}])
+    @mock_generator.expect(:call, nil, [:age, :blank, {}])
+    person.errors.stub(:generate_message, @mock_generator) 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'
+    @mock_generator.expect(:call, nil, [:name, :blank, { message: 'custom' }])
+    person.errors.stub(:generate_message, @mock_generator) do
+      assert_deprecated do
+        person.errors.add_on_blank :name, message: 'custom'
+      end
     end
   end