Switch functional tests to run through the rack interface instead of process

2 files changed, 2 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb
index bb9d8bd063..25844bf2a2 100644
--- a/actionpack/lib/action_controller/dispatch/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb
@@ -80,7 +80,7 @@ module ActionController
         Routing::Routes.call(env)
       rescue Exception => exception
         if controller ||= (::ApplicationController rescue Base)
-          controller.call_with_exception(env, exception).to_a
+          controller.call_with_exception(env, exception)
         else
           raise exception
         end
diff --git a/actionpack/lib/action_controller/dispatch/rescue.rb b/actionpack/lib/action_controller/dispatch/rescue.rb
index df80ac0909..2f3b40c231 100644
--- a/actionpack/lib/action_controller/dispatch/rescue.rb
+++ b/actionpack/lib/action_controller/dispatch/rescue.rb
@@ -62,7 +62,7 @@ module ActionController #:nodoc:
       def call_with_exception(env, exception) #:nodoc:
         request = env["action_controller.rescue.request"] ||= ActionDispatch::Request.new(env)
         response = env["action_controller.rescue.response"] ||= ActionDispatch::Response.new
-        new.process(request, response, :rescue_action, exception)
+        new.process(request, response, :rescue_action, exception).to_a
       end
     end