aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorSantiago Pastorino and Sebastian Martinez <santiago+sebastian@wyeworks.com>2010-03-18 18:59:13 -0300
committerwycats <wycats@gmail.com>2010-03-18 17:50:28 -0700
commit1e2caa5d52b9f367a1d7dc51d063a7ab1444b712 (patch)
tree0e8286d6973af7434bd88332b6457f3d1af46f99 /activesupport
parent1dacc19702f88a18a57615d1a5eeab3d0f5f9007 (diff)
downloadrails-1e2caa5d52b9f367a1d7dc51d063a7ab1444b712.tar.gz
rails-1e2caa5d52b9f367a1d7dc51d063a7ab1444b712.tar.bz2
rails-1e2caa5d52b9f367a1d7dc51d063a7ab1444b712.zip
Added missing requires abstract_unit and activesupport to the loadpath of ts_isolated [#4215 state:committed]
Signed-off-by: wycats <wycats@gmail.com>
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/callback_inheritance_test.rb1
-rw-r--r--activesupport/test/callbacks_test.rb2
-rw-r--r--activesupport/test/flush_cache_on_private_memoization_test.rb1
-rw-r--r--activesupport/test/ts_isolated.rb4
4 files changed, 6 insertions, 2 deletions
diff --git a/activesupport/test/callback_inheritance_test.rb b/activesupport/test/callback_inheritance_test.rb
index e74c64ba8d..8caf000c5d 100644
--- a/activesupport/test/callback_inheritance_test.rb
+++ b/activesupport/test/callback_inheritance_test.rb
@@ -1,3 +1,4 @@
+require 'abstract_unit'
require 'test/unit'
require 'active_support'
diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb
index 3fb940ad3c..49d9de63b0 100644
--- a/activesupport/test/callbacks_test.rb
+++ b/activesupport/test/callbacks_test.rb
@@ -1,4 +1,4 @@
-# require 'abstract_unit'
+require 'abstract_unit'
require 'test/unit'
require 'active_support'
diff --git a/activesupport/test/flush_cache_on_private_memoization_test.rb b/activesupport/test/flush_cache_on_private_memoization_test.rb
index 1cd313ec81..91b856ed7c 100644
--- a/activesupport/test/flush_cache_on_private_memoization_test.rb
+++ b/activesupport/test/flush_cache_on_private_memoization_test.rb
@@ -1,3 +1,4 @@
+require 'abstract_unit'
require 'active_support'
require 'test/unit'
diff --git a/activesupport/test/ts_isolated.rb b/activesupport/test/ts_isolated.rb
index fc1bbd6e3d..58710e0165 100644
--- a/activesupport/test/ts_isolated.rb
+++ b/activesupport/test/ts_isolated.rb
@@ -1,6 +1,8 @@
+$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
+
require 'test/unit'
require 'rbconfig'
-require 'lib/active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/kernel/reporting'
class TestIsolated < Test::Unit::TestCase
ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))