Made ActionController::Verification work with new_base

3 files changed, 6 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index eff7297973..a419a80b6a 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -16,6 +16,7 @@ module ActionController
 
     include ActionController::Session
     include ActionController::Flash
+    include ActionController::Verification
 
     # Legacy modules
     include SessionManagement
diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb
index c861af2fa2..9b85b39052 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/actionpack/lib/action_controller/new_base/compatibility.rb
@@ -103,5 +103,9 @@ module ActionController
     def _layout_prefix(name)
       super unless name =~ /\blayouts/
     end
+
+    def performed?
+      response_body
+    end
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/new_base/testing.rb b/actionpack/lib/action_controller/new_base/testing.rb
index 0659d81710..bc3bc70404 100644
--- a/actionpack/lib/action_controller/new_base/testing.rb
+++ b/actionpack/lib/action_controller/new_base/testing.rb
@@ -2,7 +2,7 @@ module ActionController
   module Testing
     
     # OMG MEGA HAX
-    def process_with_test(request, response)
+    def process_with_new_base_test(request, response)
       @_request = request
       @_response = response
       @_response.request = request