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 --- activesupport/test/abstract_unit.rb | 4 ++-- activesupport/test/ts_isolated.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'activesupport/test') 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' -- cgit v1.2.3