From d3e9d4420da68ac3df749931aed0e6354769b603 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino and Sebastian Martinez Date: Thu, 18 Mar 2010 18:59:13 -0300 Subject: [PATCH 1/2] Added missing requires abstract_unit and activesupport to the loadpath of ts_isolated [#4215 state:committed] --- activesupport/test/callback_inheritance_test.rb | 1 + activesupport/test/callbacks_test.rb | 2 +- .../flush_cache_on_private_memoization_test.rb | 1 + activesupport/test/ts_isolated.rb | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/activesupport/test/callback_inheritance_test.rb b/activesupport/test/callback_inheritance_test.rb index e74c64b..8caf000 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 3fb940a..49d9de6 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 1cd313e..91b856e 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 fc1bbd6..58710e0 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')) -- 1.7.0 From e5d4ad2d5cb77753e17dede0c3453c8b80872de8 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino and Sebastian Martinez Date: Thu, 18 Mar 2010 18:59:50 -0300 Subject: [PATCH 2/2] Make dependencies_test pass running standalone [#4215 state:resolved] --- activesupport/test/dependencies_test.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index 6ff6dfb..2cbf9e5 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -88,7 +88,7 @@ class DependenciesTest < Test::Unit::TestCase old_warnings, ActiveSupport::Dependencies.warnings_on_first_load = ActiveSupport::Dependencies.warnings_on_first_load, true filename = "check_warnings" - expanded = File.expand_path("test/dependencies/#{filename}") + expanded = File.expand_path("#{File.dirname(__FILE__)}/dependencies/#{filename}") $check_warnings_load_count = 0 assert !ActiveSupport::Dependencies.loaded.include?(expanded) -- 1.7.0