aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2019-02-21 14:30:55 -0800
committerXavier Noria <fxn@hashref.com>2019-02-21 14:51:28 -0800
commitf2e51e31239e7c1ff9a92996a3e13b128095377c (patch)
tree596ef9a1634040a7a7f66b73343947ff15d227bd
parent159b9c40dbe10451ba773ced84a39c4ecced21f4 (diff)
downloadrails-f2e51e31239e7c1ff9a92996a3e13b128095377c.tar.gz
rails-f2e51e31239e7c1ff9a92996a3e13b128095377c.tar.bz2
rails-f2e51e31239e7c1ff9a92996a3e13b128095377c.zip
simplify AS::Dependencies.verbose=
Possible thanks to Zeitwerk 1.3.0.
-rw-r--r--activesupport/lib/active_support/dependencies/zeitwerk_integration.rb2
-rw-r--r--railties/test/application/zeitwerk_integration_test.rb8
2 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb
index 939ada123d..297bde5534 100644
--- a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb
+++ b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb
@@ -28,7 +28,7 @@ module ActiveSupport
end
def verbose=(verbose)
- l = verbose ? (logger || Rails.logger).method(:debug) : nil
+ l = verbose ? logger || Rails.logger : nil
Rails.autoloaders.each { |autoloader| autoloader.logger = l }
end
diff --git a/railties/test/application/zeitwerk_integration_test.rb b/railties/test/application/zeitwerk_integration_test.rb
index 8a8ca18ebf..c683b5cc5f 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