From 4efb36e7b44ae3facb948aa3c5f2790a3fd3b61a Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 30 Jul 2014 09:46:08 -0300
Subject: [PATCH] Revert "Merge pull request #15305 from
 tgxworld/remove_unnecessary_require"

This reverts commit f632f79b8dcd144408c66a544984b2ba9cf52f87, reversing
changes made to 98c7fe87690ca4de6c46e8f69806e82e3f8af42d.

Closes #16343
---
 actionpack/lib/action_dispatch/testing/integration.rb | 1 +
 activesupport/lib/active_support/test_case.rb         | 2 ++
 railties/test/generators/argv_scrubber_test.rb        | 2 +-
 railties/test/generators/generator_test.rb            | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 12b796b95f..192ccdb9d5 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -3,6 +3,7 @@
 require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/object/try'
 require 'rack/test'
+require 'minitest'
 
 module ActionDispatch
   module Integration #:nodoc:
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index 751fdaef78..a6a878140c 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -1,3 +1,5 @@
+gem 'minitest' # make sure we get the gem, not stdlib
+require 'minitest'
 require 'active_support/testing/tagged_logging'
 require 'active_support/testing/setup_and_teardown'
 require 'active_support/testing/assertions'
diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 31c2d846e2..31e07bc8da 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -1,5 +1,5 @@
-require 'active_support/testing/autorun'
 require 'active_support/test_case'
+require 'active_support/testing/autorun'
 require 'rails/generators/rails/app/app_generator'
 require 'tempfile'
 
diff --git a/railties/test/generators/generator_test.rb b/railties/test/generators/generator_test.rb
index b136239795..7871399dd7 100644
--- a/railties/test/generators/generator_test.rb
+++ b/railties/test/generators/generator_test.rb
@@ -1,5 +1,5 @@
-require 'active_support/testing/autorun'
 require 'active_support/test_case'
+require 'active_support/testing/autorun'
 require 'rails/generators/app_base'
 
 module Rails
-- 
GitLab