diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-05-24 23:08:29 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-05-24 23:08:29 -0500 |
| commit | f632f79b8dcd144408c66a544984b2ba9cf52f87 (patch) | |
| tree | cde8fc40bcd8acff6cc68836b7b3aa07851db49f | |
| parent | 98c7fe87690ca4de6c46e8f69806e82e3f8af42d (diff) | |
| parent | 4ca5a5ea679508603f28dcae5407a634037670e5 (diff) | |
| download | rails-f632f79b8dcd144408c66a544984b2ba9cf52f87.tar.gz rails-f632f79b8dcd144408c66a544984b2ba9cf52f87.tar.bz2 rails-f632f79b8dcd144408c66a544984b2ba9cf52f87.zip | |
Merge pull request #15305 from tgxworld/remove_unnecessary_require
Remove unnecessary require of Minitest.
| -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, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index d900f3c7a9..107e62d20f 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -3,7 +3,6 @@ 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 2fb5c04316..e6c125bfdd 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -1,5 +1,3 @@ -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 31e07bc8da..31c2d846e2 100644 --- a/railties/test/generators/argv_scrubber_test.rb +++ b/railties/test/generators/argv_scrubber_test.rb @@ -1,5 +1,5 @@ -require 'active_support/test_case' require 'active_support/testing/autorun' +require 'active_support/test_case' 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 7871399dd7..b136239795 100644 --- a/railties/test/generators/generator_test.rb +++ b/railties/test/generators/generator_test.rb @@ -1,5 +1,5 @@ -require 'active_support/test_case' require 'active_support/testing/autorun' +require 'active_support/test_case' require 'rails/generators/app_base' module Rails |