diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-22 09:45:46 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-22 09:45:46 -0700 |
| commit | c86cdd1130b148fa7b0b794994cee13b751c667c (patch) | |
| tree | cb2782b2e76f4f7dc8f662fcd514718b2884b45a | |
| parent | 28855813d227cde05d57f91bd4ad1b57a4a9fd58 (diff) | |
| parent | e8dd88ac81b474cf076222ac20ff718a52872e2c (diff) | |
| download | rails-c86cdd1130b148fa7b0b794994cee13b751c667c.tar.gz rails-c86cdd1130b148fa7b0b794994cee13b751c667c.tar.bz2 rails-c86cdd1130b148fa7b0b794994cee13b751c667c.zip | |
Merge pull request #10667 from rubys/minitest-autorun
Eliminate minitest warnings
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 70b42ccd1b..71c1e666de 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -3,7 +3,7 @@ require 'uri' require 'active_support/core_ext/kernel/singleton_class' require 'active_support/core_ext/object/try' require 'rack/test' -require 'minitest/unit' +require 'minitest/autorun' module ActionDispatch module Integration #:nodoc: diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index f0962998a0..12144e6682 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -1,5 +1,5 @@ gem 'minitest' # make sure we get the gem, not stdlib -require 'minitest/unit' +require 'minitest/autorun' require 'active_support/testing/tagged_logging' require 'active_support/testing/setup_and_teardown' require 'active_support/testing/assertions' |