Merge pull request rails#46388 from jonathanhefner/action_view-deprecator

Add `ActionView.deprecator`

Author: jonathanhefner

actionpack/test/controller/render_test.rb

@@ -395,9 +395,7 @@ def test_dynamic_render_with_absolute_path
   def test_dynamic_render
     assert File.exist?(File.expand_path("../../test/abstract_unit.rb", __dir__))
     assert_raises ActionView::MissingTemplate do
-      assert_deprecated(ActionDispatch.deprecator) do
-        get :dynamic_render, params: { id: '../\\../test/abstract_unit.rb' }
-      end
+      get :dynamic_render, params: { id: '../\\../test/abstract_unit.rb' }
     end
   end
 

actionview/lib/action_view.rb

@@ -26,6 +26,7 @@
 require "active_support"
 require "active_support/rails"
 require "action_view/version"
+require "action_view/deprecator"
 
 module ActionView
   extend ActiveSupport::Autoload

actionview/lib/action_view/deprecator.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ActionView
+  def self.deprecator # :nodoc:
+    @deprecator ||= ActiveSupport::Deprecation.new
+  end
+end

actionview/lib/action_view/railtie.rb

@@ -73,6 +73,10 @@ class Railtie < Rails::Engine # :nodoc:
       end
     end
 
+    initializer "action_view.deprecator" do |app|
+      app.deprecators[:action_view] = ActionView.deprecator
+    end
+
     initializer "action_view.logger" do
       ActiveSupport.on_load(:action_view) { self.logger ||= Rails.logger }
     end

actionview/lib/action_view/template.rb

@@ -415,7 +415,7 @@ def locals_code
         locals = @locals - Module::RUBY_RESERVED_KEYWORDS
         deprecated_locals = locals.grep(/\A@+/)
         if deprecated_locals.any?
-          ActiveSupport::Deprecation.warn(<<~MSG)
+          ActionView.deprecator.warn(<<~MSG)
             Passing instance variables to `render` is deprecated.
             In Rails 7.1, #{deprecated_locals.to_sentence} will be ignored.
           MSG

actionview/lib/action_view/template/resolver.rb

@@ -10,8 +10,7 @@
 module ActionView
   # = Action View Resolver
   class Resolver
-    Path = ActionView::TemplatePath
-    deprecate_constant :Path
+    Path = ActiveSupport::Deprecation::DeprecatedConstantProxy.new("ActionView::Resolver::Path", "ActionView::TemplatePath", ActionView.deprecator)
 
     class PathParser # :nodoc:
       ParsedPath = Struct.new(:path, :details)

actionview/test/abstract_unit.rb

@@ -39,7 +39,7 @@ def self.require_helpers(helpers_dirs)
 Thread.abort_on_exception = true
 
 # Show backtraces for deprecated behavior for quicker cleanup.
-ActiveSupport::Deprecation.debug = true
+ActionView.deprecator.debug = true
 
 # Disable available locale checks to avoid warnings running the test suite.
 I18n.enforce_available_locales = false

actionview/test/template/compiled_templates_test.rb

@@ -52,7 +52,7 @@ def test_template_with_unicode_identifier
 
   def test_template_with_instance_variable_identifier
     expected_deprecation = "In Rails 7.1, @foo will be ignored."
-    assert_deprecated(expected_deprecation) do
+    assert_deprecated(expected_deprecation, ActionView.deprecator) do
       assert_equal "bar", render(template: "test/render_file_instance_variable", locals: { "@foo": "bar" })
     end
   end

actionview/test/template/render_test.rb

@@ -204,9 +204,7 @@ def test_render_partial_from_default
   def test_render_outside_path
     assert File.exist?(File.expand_path("../../test/abstract_unit.rb", __dir__))
     assert_raises ActionView::MissingTemplate do
-      assert_deprecated do
-        @view.render(template: "../\\../test/abstract_unit.rb")
-      end
+      @view.render(template: "../\\../test/abstract_unit.rb")
     end
   end
 
@@ -334,7 +332,7 @@ def test_render_error_indentation
   end
 
   def test_render_template_with_errors
-    e = assert_raises(ActionView::Template::Error) { assert_deprecated { @view.render(template: "test/_raise") } }
+    e = assert_raises(ActionView::Template::Error) { @view.render(template: "test/_raise") }
     assert_match %r!method.*doesnt_exist!, e.message
     assert_equal "", e.sub_template_message
     assert_equal "1", e.line_number
@@ -537,7 +535,7 @@ def test_render_inline_with_render_from_to_proc
   end
 
   def test_optional_second_arg_works_without_deprecation
-    assert_not_deprecated do
+    assert_not_deprecated(ActionView.deprecator) do
       ActionView::Template.register_template_handler :ruby_handler, ->(view, source = nil) { source }
     end
     assert_equal "3", @view.render(inline: "(1 + 2).to_s", type: :ruby_handler)
@@ -588,9 +586,7 @@ def test_render_ignores_templates_with_malformed_template_handlers
     %w(malformed malformed.erb malformed.html.erb malformed.en.html.erb).each do |name|
       assert File.exist?(File.expand_path("#{FIXTURE_LOAD_PATH}/test/malformed/#{name}~")), "Malformed file (#{name}~) which should be ignored does not exists"
       assert_raises(ActionView::MissingTemplate) do
-        ActiveSupport::Deprecation.silence do
-          @view.render(template: "test/malformed/#{name}")
-        end
+        @view.render(template: "test/malformed/#{name}")
       end
     end
   end

railties/test/application/configuration_test.rb

@@ -3893,6 +3893,7 @@ def new(app); self; end
       assert_equal ActionController.deprecator, Rails.application.deprecators[:action_controller]
       assert_equal ActionDispatch.deprecator, Rails.application.deprecators[:action_dispatch]
       assert_equal ActionMailer.deprecator, Rails.application.deprecators[:action_mailer]
+      assert_equal ActionView.deprecator, Rails.application.deprecators[:action_view]
       assert_equal ActiveRecord.deprecator, Rails.application.deprecators[:active_record]
       assert_equal ActiveSupport.deprecator, Rails.application.deprecators[:active_support]
     end