aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing
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 /actionpack/lib/action_dispatch/testing
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 'actionpack/lib/action_dispatch/testing')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb1
1 files changed, 1 insertions, 0 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 'uri'
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: