6 files changed, 73 insertions, 51 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
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 618df930c9..1e1d6f5429 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -34,7 +34,6 @@ require 'action_dispatch'
 require 'active_support/dependencies'
 require 'active_model'
 require 'active_record'
-require 'action_controller/caching'
 
 require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
 
@@ -58,10 +57,6 @@ ActiveSupport::Deprecation.debug = true
 # Disable available locale checks to avoid warnings running the test suite.
 I18n.enforce_available_locales = false
 
-# Register danish language for testing
-I18n.backend.store_translations 'da', {}
-I18n.backend.store_translations 'pt-BR', {}
-
 FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
 
 SharedTestRoutes = ActionDispatch::Routing::RouteSet.new
@@ -359,37 +354,15 @@ module RoutingTestHelpers
   end
 end
 
-class MetalRenderingController < ActionController::Metal
-  include AbstractController::Rendering
-  include ActionController::Rendering
-  include ActionController::Renderers
-end
-
 class ResourcesController < ActionController::Base
   def index() head :ok end
   alias_method :show, :index
 end
 
-class ThreadsController  < ResourcesController; end
-class MessagesController < ResourcesController; end
 class CommentsController < ResourcesController; end
-class ReviewsController < ResourcesController; end
-
 class AccountsController <  ResourcesController; end
-class AdminController   <  ResourcesController; end
-class ProductsController < ResourcesController; end
 class ImagesController < ResourcesController; end
 
-module Backoffice
-  class ProductsController < ResourcesController; end
-  class ImagesController < ResourcesController; end
-
-  module Admin
-    class ProductsController < ResourcesController; end
-    class ImagesController < ResourcesController; end
-  end
-end
-
 # Skips the current run on Rubinius using Minitest::Assertions#skip
 def rubinius_skip(message = '')
   skip message if RUBY_ENGINE == 'rbx'
diff --git a/actionpack/test/controller/metal/renderers_test.rb b/actionpack/test/controller/metal/renderers_test.rb
index 007866a559..247e872674 100644
--- a/actionpack/test/controller/metal/renderers_test.rb
+++ b/actionpack/test/controller/metal/renderers_test.rb
@@ -1,6 +1,12 @@
 require 'abstract_unit'
 require 'active_support/core_ext/hash/conversions'
 
+class MetalRenderingController < ActionController::Metal
+  include AbstractController::Rendering
+  include ActionController::Rendering
+  include ActionController::Renderers
+end
+
 class MetalRenderingJsonController < MetalRenderingController
   class Model
     def to_json(options = {})
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 4490abf7b2..8e38af5025 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -3,8 +3,22 @@ require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/with_options'
 require 'active_support/core_ext/array/extract_options'
 
-class ResourcesTest < ActionController::TestCase
+class AdminController < ResourcesController; end
+class MessagesController < ResourcesController; end
+class ProductsController < ResourcesController; end
+class ThreadsController < ResourcesController; end
+
+module Backoffice
+  class ProductsController < ResourcesController; end
+  class ImagesController < ResourcesController; end
+
+  module Admin
+    class ProductsController < ResourcesController; end
+    class ImagesController < ResourcesController; end
+  end
+end
 
+class ResourcesTest < ActionController::TestCase
   def test_default_restful_routes
     with_restful_routing :messages do
       assert_simply_restful_for :messages
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 6160b3395a..ea59156f65 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -154,6 +154,10 @@ XML
       render html: '<body class="foo"></body>'.html_safe
     end
 
+    def boom
+      raise 'boom!'
+    end
+
     private
 
       def generate_url(opts)
@@ -981,6 +985,26 @@ XML
       assert_redirected_to 'created resource'
     end
   end
+
+  def test_exception_in_action_reaches_test
+    assert_raise(RuntimeError) do
+      process :boom, method: "GET"
+    end
+  end
+
+  def test_request_state_is_cleared_after_exception
+    assert_raise(RuntimeError) do
+      process :boom,
+        method: "GET",
+        params: { q: 'test1' }
+    end
+
+    process :test_query_string,
+      method: "GET",
+      params: { q: 'test2' }
+
+    assert_equal "q=test2", @response.body
+  end
 end
 
 class ResponseDefaultHeadersTest < ActionController::TestCase
diff --git a/actionpack/test/dispatch/routing/concerns_test.rb b/actionpack/test/dispatch/routing/concerns_test.rb
index 7ef513b0c8..6934271846 100644
--- a/actionpack/test/dispatch/routing/concerns_test.rb
+++ b/actionpack/test/dispatch/routing/concerns_test.rb
@@ -1,5 +1,7 @@
 require 'abstract_unit'
 
+class ReviewsController < ResourcesController; end
+
 class RoutingConcernsTest < ActionDispatch::IntegrationTest
   class Reviewable
     def self.call(mapper, options = {})