aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/test_case.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-07-30 09:46:08 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2014-07-30 09:46:33 -0300
commit4efb36e7b44ae3facb948aa3c5f2790a3fd3b61a (patch)
tree24b2440689eb4b62d47591278a745cc407f427ea /activesupport/lib/active_support/test_case.rb
parent74c31ac5fe44b2e2b46e660932e6ca266b11fd58 (diff)
downloadrails-4efb36e7b44ae3facb948aa3c5f2790a3fd3b61a.tar.gz
rails-4efb36e7b44ae3facb948aa3c5f2790a3fd3b61a.tar.bz2
rails-4efb36e7b44ae3facb948aa3c5f2790a3fd3b61a.zip
Revert "Merge pull request #15305 from tgxworld/remove_unnecessary_require"
This reverts commit f632f79b8dcd144408c66a544984b2ba9cf52f87, reversing changes made to 98c7fe87690ca4de6c46e8f69806e82e3f8af42d. Closes #16343
Diffstat (limited to 'activesupport/lib/active_support/test_case.rb')
-rw-r--r--activesupport/lib/active_support/test_case.rb2
1 files changed, 2 insertions, 0 deletions
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'