8 files changed, 26 insertions, 16 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 684b828254..3a6a54768e 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -63,7 +63,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   t.test_files = %w(
     addresses_render base benchmark caching capture content_type dispatcher
     flash mime_responds record_identifier redirect render rescue url_rewriter
-    webservice
+    webservice verification
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
diff --git a/actionpack/lib/action_controller/base/verification.rb b/actionpack/lib/action_controller/base/verification.rb
index c62b81b666..a513e9f40c 100644
--- a/actionpack/lib/action_controller/base/verification.rb
+++ b/actionpack/lib/action_controller/base/verification.rb
@@ -1,7 +1,13 @@
 module ActionController #:nodoc:
   module Verification #:nodoc:
-    def self.included(base) #:nodoc:
-      base.extend(ClassMethods)
+    extend ActiveSupport::DependencyModule
+
+    # TODO : Remove the defined? check when new base is the main base
+    if defined?(ActionController::Http)
+      depends_on AbstractController::Callbacks
+      depends_on Session
+      depends_on Flash
+      depends_on Renderer
     end
 
     # This module provides a class-level method for specifying that certain
@@ -102,7 +108,7 @@ module ActionController #:nodoc:
     end
  
     def verify_presence_of_keys_in_hash_flash_or_params(options) # :nodoc:
-      [*options[:params] ].find { |v| params[v].nil?  } ||
+      [*options[:params] ].find { |v| v && params[v.to_sym].nil?  } ||
       [*options[:session]].find { |v| session[v].nil? } ||
       [*options[:flash]  ].find { |v| flash[v].nil?   }
     end
diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb
index d2f6514ff9..8bc15d2450 100644
--- a/actionpack/lib/action_controller/new_base.rb
+++ b/actionpack/lib/action_controller/new_base.rb
@@ -25,8 +25,9 @@ module ActionController
   autoload :UrlRewriter,       'action_controller/routing/generation/url_rewriter'
   autoload :UrlWriter,         'action_controller/routing/generation/url_rewriter'
 
-  autoload :Flash, 'action_controller/base/chained/flash'
-  
+  autoload :Verification, 'action_controller/base/verification'
+  autoload :Flash,        'action_controller/base/chained/flash'
+
   require 'action_controller/routing'
 end
 
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
diff --git a/actionpack/lib/action_controller/testing/process2.rb b/actionpack/lib/action_controller/testing/process2.rb
index e9a79369b9..2dafcaa5a9 100644
--- a/actionpack/lib/action_controller/testing/process2.rb
+++ b/actionpack/lib/action_controller/testing/process2.rb
@@ -53,7 +53,7 @@ module ActionController
       @controller.request = @request
       @controller.params.merge!(parameters)
       # Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
-      @controller.process_with_test(@request, @response)
+      @controller.process_with_new_base_test(@request, @response)
     end
     
     def build_request_uri(action, parameters)
diff --git a/actionpack/test/controller/verification_test.rb b/actionpack/test/controller/verification_test.rb
index 418a81baa8..85134a8264 100644
--- a/actionpack/test/controller/verification_test.rb
+++ b/actionpack/test/controller/verification_test.rb
@@ -103,17 +103,15 @@ class VerificationTest < ActionController::TestCase
     end
 
     protected
-      def rescue_action(e) raise end
 
-      def unconditional_redirect
-        redirect_to :action => "unguarded"
-      end
+    def unconditional_redirect
+      redirect_to :action => "unguarded"
+    end
   end
 
-  def setup
-    @controller = TestController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+  tests TestController
+
+  setup do
     ActionController::Routing::Routes.add_named_route :foo, '/foo', :controller => 'test', :action => 'foo'
   end