4 files changed, 48 insertions, 120 deletions

diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 3fa63917d0..f6d171bec6 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -27,14 +27,6 @@ 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'
@@ -307,8 +299,7 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "add_on_empty generates message" do
     person = Person.new
-    @mock_generator.expect(:call, nil, [:name, :empty, {}])
-    person.errors.stub(:generate_message, @mock_generator) do
+    assert_called_with(person.errors, :generate_message, [:name, :empty, {}]) do
       assert_deprecated do
         person.errors.add_on_empty :name
       end
@@ -317,9 +308,8 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "add_on_empty generates message for multiple attributes" do
     person = Person.new
-    @mock_generator.expect(:call, nil, [:name, :empty, {}])
-    @mock_generator.expect(:call, nil, [:age, :empty, {}])
-    person.errors.stub(:generate_message, @mock_generator) do
+    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
@@ -328,8 +318,7 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "add_on_empty generates message with custom default message" do
     person = Person.new
-    @mock_generator.expect(:call, nil, [:name, :empty, { message: 'custom' }])
-    person.errors.stub(:generate_message, @mock_generator) do
+    assert_called_with(person.errors, :generate_message, [:name, :empty, { message: 'custom' }]) do
       assert_deprecated do
         person.errors.add_on_empty :name, message: 'custom'
       end
@@ -339,8 +328,7 @@ class ErrorsTest < ActiveModel::TestCase
   test "add_on_empty generates message with empty string value" do
     person = Person.new
     person.name = ''
-    @mock_generator.expect(:call, nil, [:name, :empty, {}])
-    person.errors.stub(:generate_message, @mock_generator) do
+    assert_called_with(person.errors, :generate_message, [:name, :empty, {}]) do
       assert_deprecated do
         person.errors.add_on_empty :name
       end
@@ -349,8 +337,7 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "add_on_blank generates message" do
     person = Person.new
-    @mock_generator.expect(:call, nil, [:name, :blank, {}])
-    person.errors.stub(:generate_message, @mock_generator) do
+    assert_called_with(person.errors, :generate_message, [:name, :blank, {}]) do
       assert_deprecated do
         person.errors.add_on_blank :name
       end
@@ -359,9 +346,8 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "add_on_blank generates message for multiple attributes" do
     person = Person.new
-    @mock_generator.expect(:call, nil, [:name, :blank, {}])
-    @mock_generator.expect(:call, nil, [:age, :blank, {}])
-    person.errors.stub(:generate_message, @mock_generator) do
+    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
@@ -370,8 +356,7 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "add_on_blank generates message with custom default message" do
     person = Person.new
-    @mock_generator.expect(:call, nil, [:name, :blank, { message: 'custom' }])
-    person.errors.stub(:generate_message, @mock_generator) do
+    assert_called_with(person.errors, :generate_message, [:name, :blank, { message: 'custom' }]) do
       assert_deprecated do
         person.errors.add_on_blank :name, message: 'custom'
       end
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 0d179ea9ad..c100646837 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -11,6 +11,7 @@ ActiveSupport::Deprecation.debug = true
 I18n.enforce_available_locales = false
 
 require 'active_support/testing/autorun'
+require 'active_support/testing/method_call_assertions'
 
 require 'minitest/mock'
 
@@ -22,3 +23,7 @@ end
 def jruby_skip(message = '')
   skip message if defined?(JRUBY_VERSION)
 end
+
+class ActiveModel::TestCase
+  include ActiveSupport::Testing::MethodCallAssertions
+end
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index 70b93a202b..09d7226b5a 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -11,7 +11,6 @@ class I18nValidationTest < ActiveModel::TestCase
     I18n.load_path.clear
     I18n.backend = I18n::Backend::Simple.new
     I18n.backend.store_translations('en', errors: { messages: { custom: nil } })
-    @mock_generator = MiniTest::Mock.new
   end
 
   def teardown
@@ -19,7 +18,6 @@ class I18nValidationTest < ActiveModel::TestCase
     I18n.load_path.replace @old_load_path
     I18n.backend = @old_backend
     I18n.backend.reload!
-    @mock_generator.verify
   end
 
   def test_full_message_encoding
@@ -32,8 +30,7 @@ class I18nValidationTest < ActiveModel::TestCase
 
   def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
     @person.errors.add(:name, 'not found')
-    @mock_generator.expect(:call, "Person's name", [:name, default: 'Name'])
-    Person.stub(:human_attribute_name, @mock_generator) do
+    assert_called_with(Person, :human_attribute_name, [:name, default: 'Name'], returns: "Person's name") do
       assert_equal ["Person's name not found"], @person.errors.full_messages
     end
   end
@@ -58,206 +55,175 @@ class I18nValidationTest < ActiveModel::TestCase
     [ "given option that is not reserved", { format: "jpg" },             { format: "jpg" }]
   ]
 
-  # validates_confirmation_of w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_confirmation_of on generated message #{name}" do
       Person.validates_confirmation_of :title, validation_options
       @person.title_confirmation = 'foo'
-      @mock_generator.expect(:call, nil, [:title_confirmation, :confirmation, generate_message_options.merge(attribute: 'Title')])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title_confirmation, :confirmation, generate_message_options.merge(attribute: 'Title')]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_acceptance_of w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_acceptance_of on generated message #{name}" do
       Person.validates_acceptance_of :title, validation_options.merge(allow_nil: false)
-      @mock_generator.expect(:call, nil, [:title, :accepted, generate_message_options])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :accepted, generate_message_options]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_presence_of w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_presence_of on generated message #{name}" do
       Person.validates_presence_of :title, validation_options
-      @mock_generator.expect(:call, nil, [:title, :blank, generate_message_options])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :blank, generate_message_options]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_length_of :within too short w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_length_of for :within on generated message when too short #{name}" do
       Person.validates_length_of :title, validation_options.merge(within: 3..5)
-      @mock_generator.expect(:call, nil, [:title, :too_short, generate_message_options.merge(count: 3)])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :too_short, generate_message_options.merge(count: 3)]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_length_of :within too long w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_length_of for :too_long generated message #{name}" do
       Person.validates_length_of :title, validation_options.merge(within: 3..5)
       @person.title = 'this title is too long'
-      @mock_generator.expect(:call, nil, [:title, :too_long, generate_message_options.merge(count: 5)])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :too_long, generate_message_options.merge(count: 5)]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_length_of :is w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_length_of for :is on generated message #{name}" do
       Person.validates_length_of :title, validation_options.merge(is: 5)
-      @mock_generator.expect(:call, nil, [:title, :wrong_length, generate_message_options.merge(count: 5)])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :wrong_length, generate_message_options.merge(count: 5)]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_format_of w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_format_of on generated message #{name}" do
       Person.validates_format_of :title, validation_options.merge(with: /\A[1-9][0-9]*\z/)
       @person.title = '72x'
-      @mock_generator.expect(:call, nil, [:title, :invalid, generate_message_options.merge(value: '72x')])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :invalid, generate_message_options.merge(value: '72x')]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_inclusion_of w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_inclusion_of on generated message #{name}" do
       Person.validates_inclusion_of :title, validation_options.merge(in: %w(a b c))
       @person.title = 'z'
-      @mock_generator.expect(:call, nil, [:title, :inclusion, generate_message_options.merge(value: 'z')])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :inclusion, generate_message_options.merge(value: 'z')]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_inclusion_of using :within w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_inclusion_of using :within on generated message #{name}" do
       Person.validates_inclusion_of :title, validation_options.merge(within: %w(a b c))
       @person.title = 'z'
-      @mock_generator.expect(:call, nil, [:title, :inclusion, generate_message_options.merge(value: 'z')])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :inclusion, generate_message_options.merge(value: 'z')]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_exclusion_of w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_exclusion_of generated message #{name}" do
       Person.validates_exclusion_of :title, validation_options.merge(in: %w(a b c))
       @person.title = 'a'
-      @mock_generator.expect(:call, nil, [:title, :exclusion, generate_message_options.merge(value: 'a')])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :exclusion, generate_message_options.merge(value: 'a')]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_exclusion_of using :within w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_exclusion_of using :within generated message #{name}" do
       Person.validates_exclusion_of :title, validation_options.merge(within: %w(a b c))
       @person.title = 'a'
-      @mock_generator.expect(:call, nil, [:title, :exclusion, generate_message_options.merge(value: 'a')])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :exclusion, generate_message_options.merge(value: 'a')]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_numericality_of without :only_integer w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_numericality_of generated message #{name}" do
       Person.validates_numericality_of :title, validation_options
       @person.title = 'a'
-      @mock_generator.expect(:call, nil, [:title, :not_a_number, generate_message_options.merge(value: 'a')])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :not_a_number, generate_message_options.merge(value: 'a')]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_numericality_of with :only_integer w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_numericality_of for :only_integer on generated message #{name}" do
       Person.validates_numericality_of :title, validation_options.merge(only_integer: true)
       @person.title = '0.0'
-      @mock_generator.expect(:call, nil, [:title, :not_an_integer, generate_message_options.merge(value: '0.0')])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :not_an_integer, generate_message_options.merge(value: '0.0')]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_numericality_of :odd w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_numericality_of for :odd on generated message #{name}" do
       Person.validates_numericality_of :title, validation_options.merge(only_integer: true, odd: true)
       @person.title = 0
-      @mock_generator.expect(:call, nil, [:title, :odd, generate_message_options.merge(value: 0)])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :odd, generate_message_options.merge(value: 0)]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-  # validates_numericality_of :less_than w/ mocha
-
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_numericality_of for :less_than on generated message #{name}" do
       Person.validates_numericality_of :title, validation_options.merge(only_integer: true, less_than: 0)
       @person.title = 1
-      @mock_generator.expect(:call, nil, [:title, :less_than, generate_message_options.merge(value: 1, count: 0)])
-      @person.errors.stub(:generate_message, @mock_generator) do
+      call = [:title, :less_than, generate_message_options.merge(value: 1, count: 0)]
+      assert_called_with(@person.errors, :generate_message, call) do
         @person.valid?
       end
     end
   end
 
-
-  # To make things DRY this macro is defined to define 3 tests for every validation case.
+  # To make things DRY this macro is created to define 3 tests for every validation case.
   def self.set_expectations_for_validation(validation, error_type, &block_that_sets_validation)
     if error_type == :confirmation
       attribute = :title_confirmation
     else
       attribute = :title
     end
-    # test "validates_confirmation_of finds custom model key translation when blank"
+
     test "#{validation} finds custom model key translation when #{error_type}" do
       I18n.backend.store_translations 'en', activemodel: { errors: { models: { person: { attributes: { attribute => { error_type => 'custom message' } } } } } }
       I18n.backend.store_translations 'en', errors: { messages: { error_type => 'global message'}}
@@ -267,7 +233,6 @@ class I18nValidationTest < ActiveModel::TestCase
       assert_equal ['custom message'], @person.errors[attribute]
     end
 
-    # test "validates_confirmation_of finds custom model key translation with interpolation when blank"
     test "#{validation} finds custom model key translation with interpolation when #{error_type}" do
       I18n.backend.store_translations 'en', activemodel: { errors: { models: { person: { attributes: { attribute => { error_type => 'custom message with %{extra}' } } } } } }
       I18n.backend.store_translations 'en', errors: { messages: {error_type => 'global message'} }
@@ -277,7 +242,6 @@ class I18nValidationTest < ActiveModel::TestCase
       assert_equal ['custom message with extra information'], @person.errors[attribute]
     end
 
-    # test "validates_confirmation_of finds global default key translation when blank"
     test "#{validation} finds global default key translation when #{error_type}" do
       I18n.backend.store_translations 'en', errors: { messages: {error_type => 'global message'} }
 
@@ -287,27 +251,19 @@ class I18nValidationTest < ActiveModel::TestCase
     end
   end
 
-  # validates_confirmation_of w/o mocha
-
   set_expectations_for_validation "validates_confirmation_of", :confirmation do |person, options_to_merge|
     Person.validates_confirmation_of :title, options_to_merge
     person.title_confirmation = 'foo'
   end
 
-  # validates_acceptance_of w/o mocha
-
   set_expectations_for_validation "validates_acceptance_of", :accepted do |person, options_to_merge|
     Person.validates_acceptance_of :title, options_to_merge.merge(allow_nil: false)
   end
 
-  # validates_presence_of w/o mocha
-
   set_expectations_for_validation "validates_presence_of", :blank do |person, options_to_merge|
     Person.validates_presence_of :title, options_to_merge
   end
 
-  # validates_length_of :within w/o mocha
-
   set_expectations_for_validation "validates_length_of", :too_short do |person, options_to_merge|
     Person.validates_length_of :title, options_to_merge.merge(within: 3..5)
   end
@@ -317,61 +273,43 @@ class I18nValidationTest < ActiveModel::TestCase
     person.title = "too long"
   end
 
-  # validates_length_of :is w/o mocha
-
   set_expectations_for_validation "validates_length_of", :wrong_length do |person, options_to_merge|
     Person.validates_length_of :title, options_to_merge.merge(is: 5)
   end
 
-  # validates_format_of w/o mocha
-
   set_expectations_for_validation "validates_format_of", :invalid do |person, options_to_merge|
     Person.validates_format_of :title, options_to_merge.merge(with: /\A[1-9][0-9]*\z/)
   end
 
-  # validates_inclusion_of w/o mocha
-
   set_expectations_for_validation "validates_inclusion_of", :inclusion do |person, options_to_merge|
     Person.validates_inclusion_of :title, options_to_merge.merge(in: %w(a b c))
   end
 
-  # validates_exclusion_of w/o mocha
-
   set_expectations_for_validation "validates_exclusion_of", :exclusion do |person, options_to_merge|
     Person.validates_exclusion_of :title, options_to_merge.merge(in: %w(a b c))
     person.title = 'a'
   end
 
-  # validates_numericality_of without :only_integer w/o mocha
-
   set_expectations_for_validation "validates_numericality_of", :not_a_number do |person, options_to_merge|
     Person.validates_numericality_of :title, options_to_merge
     person.title = 'a'
   end
 
-  # validates_numericality_of with :only_integer w/o mocha
-
   set_expectations_for_validation "validates_numericality_of", :not_an_integer do |person, options_to_merge|
     Person.validates_numericality_of :title, options_to_merge.merge(only_integer: true)
     person.title = '1.0'
   end
 
-  # validates_numericality_of :odd w/o mocha
-
   set_expectations_for_validation "validates_numericality_of", :odd do |person, options_to_merge|
     Person.validates_numericality_of :title, options_to_merge.merge(only_integer: true, odd: true)
     person.title = 0
   end
 
-  # validates_numericality_of :less_than w/o mocha
-
   set_expectations_for_validation "validates_numericality_of", :less_than do |person, options_to_merge|
     Person.validates_numericality_of :title, options_to_merge.merge(only_integer: true, less_than: 0)
     person.title = 1
   end
 
-  # test with validates_with
-
   def test_validations_with_message_symbol_must_translate
     I18n.backend.store_translations 'en', errors: { messages: { custom_error: "I am a custom error" } }
     Person.validates_presence_of :title, message: :custom_error
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 9ee8b79da9..03c7943308 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -97,7 +97,7 @@ class ValidatesWithTest < ActiveModel::TestCase
 
   test "passes all configuration options to the validator class" do
     topic = Topic.new
-    validator = MiniTest::Mock.new
+    validator = Minitest::Mock.new
     validator.expect(:new, validator, [{foo: :bar, if: "1 == 1", class: Topic}])
     validator.expect(:validate, nil, [topic])
     validator.expect(:is_a?, false, [Symbol])