Clean up the test request/response even after an exception

1 files changed, 26 insertions, 23 deletions

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index ed2edcbe06..b1b3e87934 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -527,34 +527,37 @@ module ActionController
           @request.set_header k, @controller.config.relative_url_root
         end
 
-        @controller.recycle!
-        @controller.dispatch(action, @request, @response)
-        @request = @controller.request
-        @response = @controller.response
-
-        @request.delete_header 'HTTP_COOKIE'
+        begin
+          @controller.recycle!
+          @controller.dispatch(action, @request, @response)
+        ensure
+          @request = @controller.request
+          @response = @controller.response
+
+          @request.delete_header 'HTTP_COOKIE'
+
+          if @request.have_cookie_jar?
+            unless @request.cookie_jar.committed?
+              @request.cookie_jar.write(@response)
+              self.cookies.update(@request.cookie_jar.instance_variable_get(:@cookies))
+            end
+          end
+          @response.prepare!
 
-        if @request.have_cookie_jar?
-          unless @request.cookie_jar.committed?
-            @request.cookie_jar.write(@response)
-            self.cookies.update(@request.cookie_jar.instance_variable_get(:@cookies))
+          if flash_value = @request.flash.to_session_value
+            @request.session['flash'] = flash_value
+          else
+            @request.session.delete('flash')
           end
-        end
-        @response.prepare!
 
-        if flash_value = @request.flash.to_session_value
-          @request.session['flash'] = flash_value
-        else
-          @request.session.delete('flash')
-        end
+          if xhr
+            @request.delete_header 'HTTP_X_REQUESTED_WITH'
+            @request.delete_header 'HTTP_ACCEPT'
+          end
+          @request.query_string = ''
 
-        if xhr
-          @request.delete_header 'HTTP_X_REQUESTED_WITH'
-          @request.delete_header 'HTTP_ACCEPT'
+          @response.sent!
         end
-        @request.query_string = ''
-
-        @response.sent!
 
         @response
       end