diff options
| author | Xavier Noria <fxn@hashref.com> | 2014-10-25 13:50:42 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2014-10-25 14:06:33 +0200 |
| commit | ae07806858072cd66611c165d1eed2a113e639e5 (patch) | |
| tree | b8c5622a88dc410ffa4eeb7076b01610e93dd324 /activesupport/test/dependencies_test_helpers.rb | |
| parent | c4767e13d4ae927e6d605cad3846c9807745b883 (diff) | |
| download | rails-ae07806858072cd66611c165d1eed2a113e639e5.tar.gz rails-ae07806858072cd66611c165d1eed2a113e639e5.tar.bz2 rails-ae07806858072cd66611c165d1eed2a113e639e5.zip | |
fixes circularity check in dependencies
The check for circular loading should depend on a stack of files being
loaded at the moment, rather than the collection of loaded files.
This showed up indirectly in #16468, where a misspelled helper would
incorrectly result in a circularity error message.
References #16468
Diffstat (limited to 'activesupport/test/dependencies_test_helpers.rb')
| -rw-r--r-- | activesupport/test/dependencies_test_helpers.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/test/dependencies_test_helpers.rb b/activesupport/test/dependencies_test_helpers.rb index 9268512a97..e4d5197112 100644 --- a/activesupport/test/dependencies_test_helpers.rb +++ b/activesupport/test/dependencies_test_helpers.rb @@ -13,6 +13,7 @@ module DependenciesTestHelpers ActiveSupport::Dependencies.autoload_paths = prior_autoload_paths ActiveSupport::Dependencies.mechanism = old_mechanism ActiveSupport::Dependencies.explicitly_unloadable_constants = [] + ActiveSupport::Dependencies.clear end def with_autoloading_fixtures(&block) |