From 2a22b4c53b930678c221abbe26f2fe2394dbc261 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sun, 18 Apr 2021 18:44:14 +0200 Subject: [PATCH] Delete AS::Dependencies.hook! --- actionpack/test/abstract_unit.rb | 2 -- activesupport/lib/active_support/dependencies.rb | 7 ------- activesupport/test/dependencies_test.rb | 16 ---------------- 3 files changed, 25 deletions(-) diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index d7510556fc..5c8b09099c 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -46,8 +46,6 @@ def self.require_helpers(helpers_dirs) ActionPackTestSuiteUtils.require_helpers("#{__dir__}/fixtures/helpers") ActionPackTestSuiteUtils.require_helpers("#{__dir__}/fixtures/alternate_helpers") -ActiveSupport::Dependencies.hook! - Thread.abort_on_exception = true # Show backtraces for deprecated behavior for quicker cleanup. diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index d0e5a7ae7a..4caacadbfb 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -293,11 +293,6 @@ def require(file) end end - def hook! - Loadable.include_into(Object) - ModuleConstMissing.include_into(Module) - end - def unhook! ModuleConstMissing.exclude_from(Module) Loadable.exclude_from(Object) @@ -697,5 +692,3 @@ def real_mod_name(mod) end end end - -ActiveSupport::Dependencies.hook! diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index 16ce16fc0c..4ec310e013 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -98,22 +98,6 @@ def test_new_constants_in_with_illegal_module_name_raises_correct_error ActiveSupport::Dependencies.new_constants_in("Illegal-Name") { } end end - - def test_hook_called_multiple_times - assert_nothing_raised { ActiveSupport::Dependencies.hook! } - end - - def test_load_and_require_stay_private - assert_includes Object.private_methods, :load - assert_includes Object.private_methods, :require - - ActiveSupport::Dependencies.unhook! - - assert_includes Object.private_methods, :load - assert_includes Object.private_methods, :require - ensure - ActiveSupport::Dependencies.hook! - end end class RequireDependencyTest < ActiveSupport::TestCase