From 0fc57a41a455223477ffecdc31972206f7f427b7 Mon Sep 17 00:00:00 2001 From: Jonathan Hefner Date: Tue, 11 Apr 2023 15:47:43 -0500 Subject: [PATCH] Rename :rails deprecator as :railties Follow-up to #46049 and #47354. Since `Rails.deprecator` is now a new `ActiveSupport::Deprecation` instance instead of `ActiveSupport::Deprecation.instance`, it makes sense to register it as `Rails.application.deprecators[:railties]` instead of `Rails.application.deprecators[:rails]`. --- railties/lib/rails/application.rb | 6 +----- railties/test/application/configuration_test.rb | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index d6fb3b2c2d6ac..995f151aba21e 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -225,13 +225,9 @@ def message_verifier(verifier_name) # The collection's configuration methods affect all deprecators in the # collection. Additionally, the collection's +silence+ method silences all # deprecators in the collection for the duration of a given block. - # - # The collection is prepopulated with a default deprecator, which can be - # accessed via deprecators[:rails]. More deprecators can be added - # via deprecators[name] = deprecator. def deprecators @deprecators ||= ActiveSupport::Deprecation::Deprecators.new.tap do |deprecators| - deprecators[:rails] = Rails.deprecator + deprecators[:railties] = Rails.deprecator end end diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 98890e9c16ff6..b4a4b0c9445dc 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -4022,7 +4022,7 @@ def new(app); self; end assert_equal ActiveRecord.deprecator, Rails.application.deprecators[:active_record] assert_equal ActiveStorage.deprecator, Rails.application.deprecators[:active_storage] assert_equal ActiveSupport.deprecator, Rails.application.deprecators[:active_support] - assert_equal Rails.deprecator, Rails.application.deprecators[:rails] + assert_equal Rails.deprecator, Rails.application.deprecators[:railties] end test "can entirely opt out of deprecation warnings" do