diff options
author | Uriel Katz <uriel.katz@gmail.com> | 2012-11-17 02:05:53 +0200 |
---|---|---|
committer | Uriel Katz <uriel.katz@gmail.com> | 2012-12-01 14:00:16 +0200 |
commit | 9ee0ffb3602720fceaecc2fbae1c932341482e31 (patch) | |
tree | 9a3f7c9fab2bfce6c1ceb136e72be133f58fc8df /activesupport/test/dependencies_test.rb | |
parent | 005d910624bbfa724b638426a000c8074d4201a2 (diff) | |
download | rails-9ee0ffb3602720fceaecc2fbae1c932341482e31.tar.gz rails-9ee0ffb3602720fceaecc2fbae1c932341482e31.tar.bz2 rails-9ee0ffb3602720fceaecc2fbae1c932341482e31.zip |
Patched Marshal#load to work with constant autoloading (active_support/dependecies.rb) (issue #8167)
Diffstat (limited to 'activesupport/test/dependencies_test.rb')
-rw-r--r-- | activesupport/test/dependencies_test.rb | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index 7fea72dab5..952c82f9d8 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -1,6 +1,7 @@ require 'abstract_unit' require 'pp' require 'active_support/dependencies' +require 'dependecies_test_helpers' module ModuleWithMissing mattr_accessor :missing_count @@ -19,25 +20,7 @@ class DependenciesTest < ActiveSupport::TestCase ActiveSupport::Dependencies.clear end - 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 = [] - end - - def with_autoloading_fixtures(&block) - with_loading 'autoloading_fixtures', &block - end + include DependeciesTestHelpers def test_depend_on_path skip "LoadError#path does not exist" if RUBY_VERSION < '2.0.0' |