aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-05 23:31:16 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-05 23:31:16 -0800
commite09c3c783433e01b11ee4ea12980340cc325472e (patch)
tree1f80611a94608b296ff2c922e23bf6b631ca204a
parent958d25df4a1b0d41ce5deeeb0739c93b49bbd18d (diff)
parent74fbad7d1479e7cd6b024fa72074d17757373a8a (diff)
downloadrails-e09c3c783433e01b11ee4ea12980340cc325472e.tar.gz
rails-e09c3c783433e01b11ee4ea12980340cc325472e.tar.bz2
rails-e09c3c783433e01b11ee4ea12980340cc325472e.zip
Merge pull request #4339 from rafaelfranca/patch-2
Require ActiveSupport::TestCase form ActiveSupport isolation tests
-rw-r--r--actionpack/test/ts_isolated.rb1
-rw-r--r--activesupport/test/ts_isolated.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/ts_isolated.rb b/actionpack/test/ts_isolated.rb
index 0670e0100b..cb775508ff 100644
--- a/actionpack/test/ts_isolated.rb
+++ b/actionpack/test/ts_isolated.rb
@@ -1,3 +1,4 @@
+$:.unshift(File.dirname(__FILE__))
$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
require 'test/unit'
diff --git a/activesupport/test/ts_isolated.rb b/activesupport/test/ts_isolated.rb
index 51a88ac16d..e371238101 100644
--- a/activesupport/test/ts_isolated.rb
+++ b/activesupport/test/ts_isolated.rb
@@ -1,6 +1,7 @@
$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
require 'test/unit'
+require 'active_support/test_case'
require 'rbconfig'
require 'active_support/core_ext/kernel/reporting'