Merge pull request #13189 from strzalek/retain-ap-av-dep

Retain ActionPack dependency on ActionView. Fixes #12979.

10 files changed, 8 insertions, 33 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 6f8ae05539..5723b2cc1b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -373,6 +373,8 @@ module ActionMailer
     include AbstractController::AssetPaths
     include AbstractController::Callbacks
 
+    include ActionView::Layouts
+
     PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [:@_action_has_layout]
 
     def _protected_ivars # :nodoc:
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb
index ab5eaaa9d5..14a1b11b6d 100644
--- a/actionmailer/test/i18n_with_controller_test.rb
+++ b/actionmailer/test/i18n_with_controller_test.rb
@@ -15,9 +15,6 @@ class I18nTestMailer < ActionMailer::Base
   end
 end
 
-# Emulate AV railtie
-ActionController::Base.superclass.send(:include, ActionView::Layouts)
-
 class TestController < ActionController::Base
   def send_mail
     I18nTestMailer.mail_with_i18n_subject("test@localhost").deliver
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 8a85bf346a..1d6009bab8 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rack',      '~> 1.5.2'
   s.add_dependency 'rack-test', '~> 0.6.2'
+  s.add_dependency 'actionview', version
 
-  s.add_development_dependency 'actionview',  version
   s.add_development_dependency 'activemodel', version
 end
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index ce3a0316c4..fce61cddfd 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -13,6 +13,7 @@ module AbstractController
 
   module Rendering
     extend ActiveSupport::Concern
+    include ActionView::ViewPaths
 
     # Normalize arguments, options and then delegates render_to_body and
     # sticks the result in self.response_body.
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 7f9ed54264..85f0f50807 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -2,20 +2,6 @@ require "action_controller/log_subscriber"
 require "action_controller/metal/params_wrapper"
 
 module ActionController
-  # The <tt>metal</tt> anonymous class was introduced to solve issue with including modules in <tt>ActionController::Base</tt>.
-  # Modules needs to be included in particluar order. First we need to have <tt>AbstractController::Rendering</tt> included,
-  # next we should include actuall implementation which would be for example <tt>ActionView::Rendering</tt> and after that
-  # <tt>ActionController::Rendering</tt>. This order must be preserved and as we want to have middle module included dynamicaly
-  # <tt>metal</tt> class was introduced. It has <tt>AbstractController::Rendering</tt> included and is parent class of
-  # <tt>ActionController::Base</tt> which includes <tt>ActionController::Rendering</tt>. If we include <tt>ActionView::Rendering</tt>
-  # beetween them to perserve the required order, we can simply do this by:
-  #
-  #   ActionController::Base.superclass.send(:include, ActionView::Rendering)
-  #
-  metal = Class.new(Metal) do
-    include AbstractController::Rendering
-  end
-
   # Action Controllers are the core of a web request in \Rails. They are made up of one or more actions that are executed
   # on request and then either it renders a template or redirects to another action. An action is defined as a public method
   # on the controller, which will automatically be made accessible to the web-server through \Rails Routes.
@@ -174,7 +160,7 @@ module ActionController
   #     render action: "overthere" # won't be called if monkeys is nil
   #   end
   #
-  class Base < metal
+  class Base < Metal
     abstract!
 
     # We document the request and response methods here because albeit they are
@@ -214,6 +200,7 @@ module ActionController
     end
 
     MODULES = [
+      AbstractController::Rendering,
       AbstractController::Translation,
       AbstractController::AssetPaths,
 
@@ -221,6 +208,7 @@ module ActionController
       HideActions,
       UrlFor,
       Redirecting,
+      ActionView::Layouts,
       Rendering,
       Renderers::All,
       ConditionalGet,
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index a0d90f7eee..0e163a93eb 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -246,8 +246,6 @@ class Rack::TestCase < ActionDispatch::IntegrationTest
   end
 end
 
-ActionController::Base.superclass.send(:include, ActionView::Layouts)
-
 module ActionController
   class Base
     include ActionController::Testing
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index f41287381a..26806fb03f 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -529,4 +529,4 @@ class HeadRenderTest < ActionController::TestCase
     assert_equal "something", @response.headers["X-Custom-Header"]
     assert_response :forbidden
   end
-end
\ No newline at end of file
+end
diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb
index c2783f6377..e930ba9aae 100644
--- a/actionview/lib/action_view/railtie.rb
+++ b/actionview/lib/action_view/railtie.rb
@@ -38,17 +38,10 @@ module ActionView
 
     initializer "action_view.setup_action_pack", before: :add_view_paths do |app|
       ActiveSupport.on_load(:action_controller) do
-        ActionController::Base.superclass.send(:include, ActionView::Layouts)
         ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
       end
     end
 
-    initializer "action_view.setup_action_mailer", before: :add_view_paths do |app|
-      ActiveSupport.on_load(:action_mailer) do
-        ActionMailer::Base.send(:include, ActionView::Layouts)
-      end
-    end
-
     rake_tasks do
       load "action_view/tasks/dependencies.rake"
     end
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
index 6623b47e83..eef0abb609 100644
--- a/actionview/test/abstract_unit.rb
+++ b/actionview/test/abstract_unit.rb
@@ -267,8 +267,6 @@ class Rack::TestCase < ActionDispatch::IntegrationTest
   end
 end
 
-# Emulate AV railtie.
-ActionController::Base.superclass.send(:include, ActionView::Layouts)
 ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
 
 module ActionController
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index e45a5228a1..a9b237d0a5 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,7 +1,5 @@
 require 'abstract_unit'
 
-ActionController::Base.superclass.send(:include, ActionView::Layouts)
-
 module ActionController
   class Base
     include ActionController::Testing