aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-06 15:18:12 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-06 15:50:47 -0800
commitb15d2c0708b78ee1c8ad6958022214bda18bdbae (patch)
tree514d2005aa2c25514b17c40882a5c416025e152f /activesupport
parenta58fb105e73837dd9b20a4f2f78ec45d49db4442 (diff)
downloadrails-b15d2c0708b78ee1c8ad6958022214bda18bdbae.tar.gz
rails-b15d2c0708b78ee1c8ad6958022214bda18bdbae.tar.bz2
rails-b15d2c0708b78ee1c8ad6958022214bda18bdbae.zip
require minitest rather than test/unit
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/test_case.rb2
-rw-r--r--activesupport/test/abstract_unit.rb4
-rw-r--r--activesupport/test/ts_isolated.rb2
3 files changed, 4 insertions, 4 deletions
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'