Merge pull request #35363 from rails/zeitwerk-1.3.0

Bumps Zeitwerk

2 files changed, 7 insertions, 8 deletions

diff --git a/railties/lib/rails/autoloaders.rb b/railties/lib/rails/autoloaders.rb
index 4b41e1faf9..a6974cc207 100644
--- a/railties/lib/rails/autoloaders.rb
+++ b/railties/lib/rails/autoloaders.rb
@@ -25,8 +25,7 @@ module Rails
       end
 
       def logger=(logger)
-        callable_or_nil = logger.respond_to?(:debug) ? logger.method(:debug) : logger
-        each { |loader| loader.logger = callable_or_nil }
+        each { |loader| loader.logger = logger }
       end
 
       def zeitwerk_enabled?
diff --git a/railties/test/application/zeitwerk_integration_test.rb b/railties/test/application/zeitwerk_integration_test.rb
index 8a8ca18ebf..18e53f88b7 100644
--- a/railties/test/application/zeitwerk_integration_test.rb
+++ b/railties/test/application/zeitwerk_integration_test.rb
@@ -164,7 +164,7 @@ class ZeitwerkIntegrationTest < ActiveSupport::TestCase
     assert_equal %i(main_autoloader), $zeitwerk_integration_reload_test
   end
 
-  test "verbose = true sets the debug method of the dependencies logger if present" do
+  test "verbose = true sets the dependencies logger if present" do
     boot
 
     logger = Logger.new(File::NULL)
@@ -172,17 +172,17 @@ class ZeitwerkIntegrationTest < ActiveSupport::TestCase
     ActiveSupport::Dependencies.verbose = true
 
     Rails.autoloaders.each do |autoloader|
-      assert_equal logger.method(:debug), autoloader.logger
+      assert_same logger, autoloader.logger
     end
   end
 
-  test "verbose = true sets the debug method of the Rails logger as fallback" do
+  test "verbose = true sets the Rails logger as fallback" do
     boot
 
     ActiveSupport::Dependencies.verbose = true
 
     Rails.autoloaders.each do |autoloader|
-      assert_equal Rails.logger.method(:debug), autoloader.logger
+      assert_same Rails.logger, autoloader.logger
     end
   end
 
@@ -214,13 +214,13 @@ class ZeitwerkIntegrationTest < ActiveSupport::TestCase
     Rails.autoloaders.logger = logger
 
     Rails.autoloaders.each do |autoloader|
-      assert_equal logger, autoloader.logger
+      assert_same logger, autoloader.logger
     end
 
     Rails.autoloaders.logger = Rails.logger
 
     Rails.autoloaders.each do |autoloader|
-      assert_equal Rails.logger.method(:debug), autoloader.logger
+      assert_same Rails.logger, autoloader.logger
     end
 
     Rails.autoloaders.logger = nil