Merge branch 'minitest_cleanup'

4 files changed, 5 insertions, 4 deletions

diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index ecd5e03978..491faf4af9 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -3,7 +3,7 @@ ENV["RAILS_ENV"] ||= "test"
 require File.expand_path("../../../load_paths", __FILE__)
 
 require 'stringio'
-require 'minitest/autorun'
+require 'active_support/testing/autorun'
 require 'fileutils'
 
 require 'active_support'
diff --git a/railties/test/configuration/middleware_stack_proxy_test.rb b/railties/test/configuration/middleware_stack_proxy_test.rb
index 5984c0b425..2442cb995d 100644
--- a/railties/test/configuration/middleware_stack_proxy_test.rb
+++ b/railties/test/configuration/middleware_stack_proxy_test.rb
@@ -1,6 +1,7 @@
-require 'minitest/autorun'
+require 'active_support/testing/autorun'
 require 'rails/configuration'
 require 'active_support/test_case'
+require 'minitest/mock'
 
 module Rails
   module Configuration
diff --git a/railties/test/engine_test.rb b/railties/test/engine_test.rb
index addf49cdb6..7970913d21 100644
--- a/railties/test/engine_test.rb
+++ b/railties/test/engine_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 
 class EngineTest < ActiveSupport::TestCase
-  it "reports routes as available only if they're actually present" do
+  test "reports routes as available only if they're actually present" do
     engine = Class.new(Rails::Engine) do
       def initialize(*args)
         @routes = nil
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 0cb65f8e0d..172a42a549 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -9,7 +9,7 @@
 require 'fileutils'
 
 require 'bundler/setup' unless defined?(Bundler)
-require 'minitest/autorun'
+require 'active_support/testing/autorun'
 require 'active_support/test_case'
 
 RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")