Permalink
Browse files

require minitest rather than test/unit

  • Loading branch information...
1 parent a58fb10 commit b15d2c0708b78ee1c8ad6958022214bda18bdbae @tenderlove tenderlove committed Jan 6, 2012
View
2 actionmailer/test/abstract_unit.rb
@@ -23,7 +23,7 @@
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'
View
2 actionpack/test/abstract_unit.rb
@@ -21,7 +21,7 @@
Encoding.default_external = "UTF-8"
end
-require 'test/unit'
+require 'minitest/autorun'
require 'abstract_controller'
require 'action_controller'
require 'action_view'
View
2 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'
View
2 activemodel/test/cases/helper.rb
@@ -10,4 +10,4 @@
# Show backtraces for deprecated behavior for quicker cleanup.
ActiveSupport::Deprecation.debug = true
-require 'test/unit'
+require 'minitest/autorun'
View
2 activeresource/test/abstract_unit.rb
@@ -3,7 +3,7 @@
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'
View
2 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'
View
4 activesupport/test/abstract_unit.rb
@@ -18,7 +18,7 @@
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
+ActiveSupport::Deprecation.debug = true
View
2 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'
View
2 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'
View
2 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'
View
2 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'
View
2 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'
View
2 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

0 comments on commit b15d2c0

Please sign in to comment.