diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-22 13:20:59 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-22 13:21:47 +0200 |
| commit | a6e945554dedf0a33527df2b43c283dd17ae8eb3 (patch) | |
| tree | 7b61a427a9a8fcc13ea699d399bea32e30caf39b /activesupport/test | |
| parent | a0eee5f3f293fe0bfcda89f69ebfc6da7176349d (diff) | |
| download | rails-a6e945554dedf0a33527df2b43c283dd17ae8eb3.tar.gz rails-a6e945554dedf0a33527df2b43c283dd17ae8eb3.tar.bz2 rails-a6e945554dedf0a33527df2b43c283dd17ae8eb3.zip | |
Fix failing tests.
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/dependencies_test.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/load_paths_test.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index ef017d7436..2ddbce5150 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -24,11 +24,13 @@ class DependenciesTest < Test::Unit::TestCase old_mechanism, ActiveSupport::Dependencies.mechanism = ActiveSupport::Dependencies.mechanism, :load this_dir = File.dirname(__FILE__) parent_dir = File.dirname(this_dir) + path_copy = $LOAD_PATH.dup $LOAD_PATH.unshift(parent_dir) unless $LOAD_PATH.include?(parent_dir) prior_autoload_paths = ActiveSupport::Dependencies.autoload_paths ActiveSupport::Dependencies.autoload_paths = from.collect { |f| "#{this_dir}/#{f}" } yield ensure + $LOAD_PATH.replace(path_copy) ActiveSupport::Dependencies.autoload_paths = prior_autoload_paths ActiveSupport::Dependencies.mechanism = old_mechanism ActiveSupport::Dependencies.explicitly_unloadable_constants = [] diff --git a/activesupport/test/load_paths_test.rb b/activesupport/test/load_paths_test.rb index 36e3726a02..a2d8da726a 100644 --- a/activesupport/test/load_paths_test.rb +++ b/activesupport/test/load_paths_test.rb @@ -10,6 +10,7 @@ class LoadPathsTest < Test::Unit::TestCase } load_paths_count[File.expand_path('../../lib', __FILE__)] -= 1 - assert load_paths_count.select { |k, v| v > 1 }.empty?, $LOAD_PATH.inspect + filtered = load_paths_count.select { |k, v| v > 1 } + assert filtered.empty?, filtered.inspect end end |