Revert "MethodCallAssertions is a regular player of the team ActiveSupport::TestCase now"

This reverts commit 98d0f7ebd34b858f12a12dcf37ae54fdbb5cab64.

2 files changed, 4 insertions, 0 deletions

diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index c68ba46a9a..8b42cb83db 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -3,6 +3,7 @@
 require "abstract_unit"
 require "active_support/core_ext/module/remove_method"
 require "active_support/testing/stream"
+require "active_support/testing/method_call_assertions"
 require "rails/generators"
 require "rails/generators/test_case"
 
@@ -27,6 +28,7 @@ require "action_view"
 
 module GeneratorsTestHelper
   include ActiveSupport::Testing::Stream
+  include ActiveSupport::Testing::MethodCallAssertions
 
   GemfileEntry = Struct.new(:name, :version, :comment, :options, :commented_out) do
     def initialize(name, version, comment, options = {}, commented_out = false)
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 40731d5f07..6077ba3ee7 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -14,6 +14,7 @@ require "bundler/setup" unless defined?(Bundler)
 require "active_support"
 require "active_support/testing/autorun"
 require "active_support/testing/stream"
+require "active_support/testing/method_call_assertions"
 require "active_support/test_case"
 require "minitest/retry"
 
@@ -494,6 +495,7 @@ class ActiveSupport::TestCase
   include TestHelpers::Generation
   include TestHelpers::Reload
   include ActiveSupport::Testing::Stream
+  include ActiveSupport::Testing::MethodCallAssertions
 end
 
 # Create a scope and build a fixture rails app