1 files changed, 16 insertions, 15 deletions

diff --git a/actionpack/test/abstract_controller/layouts_test.rb b/actionpack/test/abstract_controller/layouts_test.rb
index 3d4570bfef..d3440c3de0 100644
--- a/actionpack/test/abstract_controller/layouts_test.rb
+++ b/actionpack/test/abstract_controller/layouts_test.rb
@@ -1,14 +1,15 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'active_support/core_ext/class/removal'
 
 module AbstractControllerTests
   module Layouts
 
     # Base controller for these tests
     class Base < AbstractController::Base
-      use AbstractController::Renderer
-      use AbstractController::Layouts
-      
-      self.view_paths = [ActionView::FixtureTemplate::FixturePath.new(
+      include AbstractController::Renderer
+      include AbstractController::Layouts
+
+      self.view_paths = [ActionView::Template::FixturePath.new(
         "layouts/hello.erb"                     => "With String <%= yield %>",
         "layouts/hello_override.erb"            => "With Override <%= yield %>",
         "layouts/abstract_controller_tests/layouts/with_string_implied_child.erb" =>
@@ -152,12 +153,12 @@ module AbstractControllerTests
     class TestBase < ActiveSupport::TestCase
       test "when no layout is specified, and no default is available, render without a layout" do
         result = Blank.process(:index)
-        assert_equal "Hello blank!", result.response_obj[:body]
+        assert_equal "Hello blank!", result.response_body
       end
       
       test "when layout is specified as a string, render with that layout" do
         result = WithString.process(:index)
-        assert_equal "With String Hello string!", result.response_obj[:body]
+        assert_equal "With String Hello string!", result.response_body
       end
       
       test "when layout is specified as a string, but the layout is missing, raise an exception" do
@@ -166,22 +167,22 @@ module AbstractControllerTests
       
       test "when layout is specified as false, do not use a layout" do
         result = WithFalseLayout.process(:index)
-        assert_equal "Hello false!", result.response_obj[:body]
+        assert_equal "Hello false!", result.response_body
       end
       
       test "when layout is specified as nil, do not use a layout" do
         result = WithNilLayout.process(:index)
-        assert_equal "Hello nil!", result.response_obj[:body]
+        assert_equal "Hello nil!", result.response_body
       end
       
       test "when layout is specified as a symbol, call the requested method and use the layout returned" do
         result = WithSymbol.process(:index)
-        assert_equal "OMGHI2U Hello symbol!", result.response_obj[:body]
+        assert_equal "OMGHI2U Hello symbol!", result.response_body
       end
       
       test "when layout is specified as a symbol and the method returns nil, don't use a layout" do
         result = WithSymbolReturningNil.process(:index)
-        assert_equal "Hello nilz!", result.response_obj[:body]
+        assert_equal "Hello nilz!", result.response_body
       end
       
       test "when the layout is specified as a symbol and the method doesn't exist, raise an exception" do
@@ -194,28 +195,28 @@ module AbstractControllerTests
       
       test "when a child controller does not have a layout, use the parent controller layout" do
         result = WithStringChild.process(:index)
-        assert_equal "With String Hello string!", result.response_obj[:body]
+        assert_equal "With String Hello string!", result.response_body
       end
       
       test "when a child controller has specified a layout, use that layout and not the parent controller layout" do
         result = WithStringOverriddenChild.process(:index)
-        assert_equal "With Override Hello string!", result.response_obj[:body]
+        assert_equal "With Override Hello string!", result.response_body
       end
       
       test "when a child controller has an implied layout, use that layout and not the parent controller layout" do
         result = WithStringImpliedChild.process(:index)
-        assert_equal "With Implied Hello string!", result.response_obj[:body]
+        assert_equal "With Implied Hello string!", result.response_body
       end
       
       test "when a child controller specifies layout nil, do not use the parent layout" do
         result = WithNilChild.process(:index)
-        assert_equal "Hello string!", result.response_obj[:body]
+        assert_equal "Hello string!", result.response_body
       end
             
       test "when a grandchild has no layout specified, the child has an implied layout, and the " \
         "parent has specified a layout, use the child controller layout" do
           result = WithChildOfImplied.process(:index)
-          assert_equal "With Implied Hello string!", result.response_obj[:body]
+          assert_equal "With Implied Hello string!", result.response_body
       end
       
       test "raises an exception when specifying layout true" do