Aliased AbstractController::ActionNotFound to ActionController::UnknownAction

2 files changed, 9 insertions, 5 deletions

diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb
index 3b1a74ec0c..b6e15a4e0d 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/actionpack/lib/action_controller/new_base/compatibility.rb
@@ -3,6 +3,9 @@ module ActionController
   
     # Temporary hax
     setup do
+      ::ActionController::UnknownAction = ::AbstractController::ActionNotFound
+      ::ActionController::DoubleRenderError = ::AbstractController::DoubleRenderError
+      
       cattr_accessor :session_options
       self.send(:class_variable_set, "@@session_options", {})
       
@@ -31,11 +34,11 @@ module ActionController
 
       super
     end
-   
-   def _layout_for_name(name)
-     name &&= name.sub(%r{^/?layouts/}, '')
-     super
-   end
+      
+    def _layout_for_name(name)
+      name &&= name.sub(%r{^/?layouts/}, '')
+      super
+    end
    
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/testing/process2.rb b/actionpack/lib/action_controller/testing/process2.rb
index 67b5afb9c5..18b7335450 100644
--- a/actionpack/lib/action_controller/testing/process2.rb
+++ b/actionpack/lib/action_controller/testing/process2.rb
@@ -39,6 +39,7 @@ module ActionController
 
       @request.recycle!
       @response.recycle!
+      @controller.response_body = nil
 
       @html_document = nil
       @request.env['REQUEST_METHOD'] = http_method