diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-07-30 09:46:08 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-07-30 09:46:33 -0300 |
| commit | 4efb36e7b44ae3facb948aa3c5f2790a3fd3b61a (patch) | |
| tree | 24b2440689eb4b62d47591278a745cc407f427ea | |
| parent | 74c31ac5fe44b2e2b46e660932e6ca266b11fd58 (diff) | |
| download | rails-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
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/argv_scrubber_test.rb | 2 | ||||
| -rw-r--r-- | 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 '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: 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 |