From b7fe3bddef690f4188905dd7f6f57e6a876d239c Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Thu, 21 Feb 2019 14:35:09 -0800 Subject: simplifies Rails.autoloaders.logger= Possible thanks to Zeitwerk 1.3.0. --- railties/lib/rails/autoloaders.rb | 3 +-- railties/test/application/zeitwerk_integration_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'railties') 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 c683b5cc5f..18e53f88b7 100644 --- a/railties/test/application/zeitwerk_integration_test.rb +++ b/railties/test/application/zeitwerk_integration_test.rb @@ -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 -- cgit v1.2.3