aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/test_case.rb
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-06-22 13:44:21 +0300
committerMichael Koziarski <michael@koziarski.com>2008-07-04 10:41:39 +0300
commit51e13d51adee3c69feab30aa4c0b08d2278ccc5f (patch)
tree9c48ac4e22aae8aea84b82c76bd99fa93f5a92c8 /activesupport/lib/active_support/test_case.rb
parent01637796d712943ebf9e9a76aa5c708edfab4d02 (diff)
downloadrails-51e13d51adee3c69feab30aa4c0b08d2278ccc5f.tar.gz
rails-51e13d51adee3c69feab30aa4c0b08d2278ccc5f.tar.bz2
rails-51e13d51adee3c69feab30aa4c0b08d2278ccc5f.zip
Move test related core_ext stuff out of regular core ext to prevent nasty surprises when you require active_support then use Test::Unit directly.
Diffstat (limited to 'activesupport/lib/active_support/test_case.rb')
-rw-r--r--activesupport/lib/active_support/test_case.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index 2fd02d5313..0f531b0c79 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -1,11 +1,7 @@
require 'test/unit/testcase'
-require 'active_support/testing/setup_and_teardown'
require 'active_support/testing/default'
+require 'active_support/testing/core_ext/test'
-# TODO: move to core_ext
-class Test::Unit::TestCase #:nodoc:
- include ActiveSupport::Testing::SetupAndTeardown
-end
module ActiveSupport
class TestCase < Test::Unit::TestCase