diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index 600bb94df3..c5733b43c6 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -34,8 +34,6 @@ end ActionViewTestSuiteUtils.require_helpers("#{__dir__}/fixtures/helpers") ActionViewTestSuiteUtils.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 4caacadbfb..0af902b55b 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -293,11 +293,6 @@ module ActiveSupport # :nodoc: end end - def unhook! - ModuleConstMissing.exclude_from(Module) - Loadable.exclude_from(Object) - end - def load? mechanism == :load end diff --git a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb index 8b7d08c8f7..c00082e0c6 100644 --- a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb +++ b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb @@ -37,10 +37,6 @@ module ActiveSupport l = verbose ? logger || Rails.logger : nil Rails.autoloaders.each { |autoloader| autoloader.logger = l } end - - def unhook! - :no_op - end end module Inflector @@ -103,7 +99,6 @@ module ActiveSupport end def decorate_dependencies - Dependencies.unhook! Dependencies.singleton_class.prepend(Decorations) end end diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 900eb8c6e0..7bebdfcdb6 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -245,13 +245,6 @@ module Rails end end end - - # Disable dependency loading during request cycle - initializer :disable_dependency_loading do - if config.eager_load && config.cache_classes && !config.enable_dependency_loading - ActiveSupport::Dependencies.unhook! - end - end end end end diff --git a/railties/test/application/zeitwerk_integration_test.rb b/railties/test/application/zeitwerk_integration_test.rb index 33f81bdb86..795b7e9dae 100644 --- a/railties/test/application/zeitwerk_integration_test.rb +++ b/railties/test/application/zeitwerk_integration_test.rb @@ -305,13 +305,6 @@ class ZeitwerkIntegrationTest < ActiveSupport::TestCase assert_equal %i(main_autoloader), $zeitwerk_integration_reload_test end - test "unhooks" do - boot - - assert_equal Module, Module.method(:const_missing).owner - assert_equal :no_op, deps.unhook! - end - test "reloading invokes before_remove_const" do $before_remove_const_invoked = false