From b15d2c0708b78ee1c8ad6958022214bda18bdbae Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 6 Jan 2012 15:18:12 -0800 Subject: require minitest rather than test/unit --- actionmailer/test/abstract_unit.rb | 2 +- actionpack/test/abstract_unit.rb | 2 +- actionpack/test/ts_isolated.rb | 2 +- activemodel/test/cases/helper.rb | 2 +- activeresource/test/abstract_unit.rb | 2 +- activesupport/lib/active_support/test_case.rb | 2 +- activesupport/test/abstract_unit.rb | 4 ++-- activesupport/test/ts_isolated.rb | 2 +- .../lib/rails/generators/test_unit/plugin/templates/test_helper.rb | 2 +- railties/lib/rails/test_help.rb | 2 +- railties/test/abstract_unit.rb | 2 +- railties/test/application/route_inspect_test.rb | 2 +- railties/test/isolation/abstract_unit.rb | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index d86e0dc4c0..3a519253f9 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -23,7 +23,7 @@ end lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) -require 'test/unit' +require 'minitest/autorun' require 'action_mailer' require 'action_mailer/test_case' diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index a875a9f8b0..0a25d7ba47 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -21,7 +21,7 @@ silence_warnings do Encoding.default_external = "UTF-8" end -require 'test/unit' +require 'minitest/autorun' require 'abstract_controller' require 'action_controller' require 'action_view' diff --git a/actionpack/test/ts_isolated.rb b/actionpack/test/ts_isolated.rb index cb775508ff..7430de2299 100644 --- a/actionpack/test/ts_isolated.rb +++ b/actionpack/test/ts_isolated.rb @@ -1,7 +1,7 @@ $:.unshift(File.dirname(__FILE__)) $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib') -require 'test/unit' +require 'minitest/autorun' require 'rbconfig' require 'active_support/core_ext/kernel/reporting' require 'abstract_unit' diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index 2e860272a4..4347b17cbc 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -10,4 +10,4 @@ require 'active_support/core_ext/string/access' # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true -require 'test/unit' +require 'minitest/autorun' diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 38df583990..c68625df4f 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -3,7 +3,7 @@ require File.expand_path('../../../load_paths', __FILE__) lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) -require 'test/unit' +require 'minitest/autorun' require 'active_resource' require 'active_support' require 'active_support/test_case' diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index bfe73de516..8d2e4ce508 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -1,4 +1,4 @@ -require 'minitest/unit' +require 'minitest/spec' require 'active_support/testing/setup_and_teardown' require 'active_support/testing/assertions' require 'active_support/testing/deprecation' diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index 504ac3e9b9..40e25ce0cd 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -18,7 +18,7 @@ silence_warnings do Encoding.default_external = "UTF-8" end -require 'test/unit' +require 'minitest/autorun' require 'empty_bool' silence_warnings { require 'mocha' } @@ -37,4 +37,4 @@ def uses_memcached(test_name) end # Show backtraces for deprecated behavior for quicker cleanup. -ActiveSupport::Deprecation.debug = true \ No newline at end of file +ActiveSupport::Deprecation.debug = true diff --git a/activesupport/test/ts_isolated.rb b/activesupport/test/ts_isolated.rb index e371238101..1d96c20bb6 100644 --- a/activesupport/test/ts_isolated.rb +++ b/activesupport/test/ts_isolated.rb @@ -1,6 +1,6 @@ $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib') -require 'test/unit' +require 'minitest/autorun' require 'active_support/test_case' require 'rbconfig' require 'active_support/core_ext/kernel/reporting' diff --git a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb index 2ca36a1e44..e82e321914 100644 --- a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb +++ b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb @@ -1,3 +1,3 @@ require 'rubygems' -require 'test/unit' +require 'minitest/autorun' require 'active_support' diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 1b5ab549be..156c35b7a4 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -2,7 +2,7 @@ # so fixtures aren't loaded into that environment abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production? -require 'test/unit' +require 'minitest/autorun' require 'active_support/test_case' require 'action_controller/test_case' require 'action_dispatch/testing/integration' diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb index 400068d94c..29ebdc6511 100644 --- a/railties/test/abstract_unit.rb +++ b/railties/test/abstract_unit.rb @@ -1,7 +1,7 @@ require File.expand_path("../../../load_paths", __FILE__) require 'stringio' -require 'test/unit' +require 'minitest/autorun' require 'fileutils' require 'active_support' diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb index 0b16021b6d..fcfa87e395 100644 --- a/railties/test/application/route_inspect_test.rb +++ b/railties/test/application/route_inspect_test.rb @@ -1,4 +1,4 @@ -require 'test/unit' +require 'minitest/autorun' require 'rails/application/route_inspector' require 'action_controller' require 'rails/engine' diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index e3b25e36db..72588af631 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -8,8 +8,8 @@ # Rails booted up. require 'fileutils' -require 'test/unit' require 'rubygems' +require 'minitest/autorun' require 'active_support/test_case' # TODO: Remove setting this magic constant -- cgit v1.2.3