Merge pull request #1269 from arunagw/fix_load_path_test_3_0

Fix load path test 3 0
rails · May 24, 2011 · f236dbf · f236dbf
2 parents f505565 + 17c9efb
commit f236dbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
@@ -24,11 +24,13 @@ def with_loading(*from)
     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
@@ -10,6 +10,7 @@ def test_uniq_load_paths
     }
     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