diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-08-09 12:40:16 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-08-09 12:40:16 -0700 |
| commit | 87e2c1895f486937cfb5ea2a3a4168b3a57d447b (patch) | |
| tree | 9fa7d050078c64c11bcbcd31a50f684ebc97762e /activesupport | |
| parent | d0bcf51191d71edfddf38ade6ff7a3099ba23a54 (diff) | |
| download | rails-87e2c1895f486937cfb5ea2a3a4168b3a57d447b.tar.gz rails-87e2c1895f486937cfb5ea2a3a4168b3a57d447b.tar.bz2 rails-87e2c1895f486937cfb5ea2a3a4168b3a57d447b.zip | |
Fix failing dependencies test relying on . being in LOAD_PATH
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/test/dependencies_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index fe9f86fd8c..97d70cf8c4 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -24,9 +24,11 @@ class DependenciesTest < Test::Unit::TestCase def with_loading(*from) old_mechanism, ActiveSupport::Dependencies.mechanism = ActiveSupport::Dependencies.mechanism, :load - dir = File.dirname(__FILE__) + this_dir = File.dirname(__FILE__) + parent_dir = File.dirname(this_dir) + $LOAD_PATH.unshift(parent_dir) unless $LOAD_PATH.include?(parent_dir) prior_load_paths = ActiveSupport::Dependencies.load_paths - ActiveSupport::Dependencies.load_paths = from.collect { |f| "#{dir}/#{f}" } + ActiveSupport::Dependencies.load_paths = from.collect { |f| "#{this_dir}/#{f}" } yield ensure ActiveSupport::Dependencies.load_paths = prior_load_paths |