Fix AP test suite after moving stuff to AV

rails · Aug 25, 2013 · 8c2c95e · 8c2c95e
1 parent 75d38e4
commit 8c2c95e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
@@ -10,6 +10,7 @@ module AbstractController
   autoload :Base
   autoload :Callbacks
   autoload :Collector
+  autoload :DoubleRenderError, "abstract_controller/rendering.rb"
   autoload :Helpers
   autoload :Logger
   autoload :Translation

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
@@ -201,6 +201,7 @@ def self.without_modules(*modules)
     end
 
     MODULES = [
+      ActionView::Layouts,
       AbstractController::Translation,
       AbstractController::AssetPaths,
 

diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
@@ -29,7 +29,7 @@ class TestBasic < ActiveSupport::TestCase
     # Test Render mixin
     # ====
     class RenderingController < AbstractController::Base
-      include AbstractController::Rendering
+      include ActionView::Rendering
 
       def _prefixes
         []
@@ -153,7 +153,7 @@ def setup
     # ====
     # self._layout is used when defined
     class WithLayouts < PrefixedViews
-      include AbstractController::Layouts
+      include ActionView::Layouts
 
       private
       def self.layout(formats)

diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
@@ -6,7 +6,7 @@ module AbstractController
   module Testing
 
     class ControllerWithHelpers < AbstractController::Base
-      include AbstractController::Rendering
+      include ActionView::Rendering
       include AbstractController::Helpers
 
       def with_module

diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
@@ -5,8 +5,8 @@ module Layouts
 
     # Base controller for these tests
     class Base < AbstractController::Base
-      include AbstractController::Rendering
-      include AbstractController::Layouts
+      include ActionView::Rendering
+      include ActionView::Layouts
 
       abstract!
 

diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Testing
 
     class ControllerRenderer < AbstractController::Base
-      include AbstractController::Rendering
+      include ActionView::Rendering
 
       def _prefixes
         %w[renderer]

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
@@ -271,6 +271,7 @@ def assert_header(name, value)
 module ActionController
   class Base
     include ActionController::Testing
+    include ActionView::Layouts
     # This stub emulates the Railtie including the URL helpers from a Rails application
     include SharedTestRoutes.url_helpers
     include SharedTestRoutes.mounted_helpers