kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix failing tests.

Browse source
This commit is contained in:
José Valim 2011-05-22 13:20:59 +02:00
parent a0eee5f3f2
commit a6e945554d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activesupport/test/dependencies_test.rb
View file

@ -24,11 +24,13 @@ class DependenciesTest < Test::Unit::TestCase
old_mechanism, ActiveSupport::Dependencies.mechanism = ActiveSupport::Dependencies.mechanism, :load old_mechanism, ActiveSupport::Dependencies.mechanism = ActiveSupport::Dependencies.mechanism, :load
this_dir = File.dirname(__FILE__) this_dir = File.dirname(__FILE__)
parent_dir = File.dirname(this_dir) parent_dir = File.dirname(this_dir)
path_copy = $LOAD_PATH.dup
$LOAD_PATH.unshift(parent_dir) unless $LOAD_PATH.include?(parent_dir) $LOAD_PATH.unshift(parent_dir) unless $LOAD_PATH.include?(parent_dir)
prior_autoload_paths = ActiveSupport::Dependencies.autoload_paths prior_autoload_paths = ActiveSupport::Dependencies.autoload_paths
ActiveSupport::Dependencies.autoload_paths = from.collect { |f| "#{this_dir}/#{f}" } ActiveSupport::Dependencies.autoload_paths = from.collect { |f| "#{this_dir}/#{f}" }
yield yield
ensure ensure
$LOAD_PATH.replace(path_copy)
ActiveSupport::Dependencies.autoload_paths = prior_autoload_paths ActiveSupport::Dependencies.autoload_paths = prior_autoload_paths
ActiveSupport::Dependencies.mechanism = old_mechanism ActiveSupport::Dependencies.mechanism = old_mechanism
ActiveSupport::Dependencies.explicitly_unloadable_constants = [] ActiveSupport::Dependencies.explicitly_unloadable_constants = []

3
activesupport/test/load_paths_test.rb
View file

@ -10,6 +10,7 @@ class LoadPathsTest < Test::Unit::TestCase
} }
load_paths_count[File.expand_path('../../lib', __FILE__)] -= 1 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
end end