Clean up the test request/response even after an exception

6d4ac272 · Matthew Draper · c4cb6862 · 6d4ac272 · 6d4ac272
Showing with 50 addition and 23 deletion

actionpack/lib/action_controller/test_case.rb actionpack/lib/action_controller/test_case.rb +26 -23

actionpack/test/controller/test_case_test.rb actionpack/test/controller/test_case_test.rb +24 -0

未找到文件。
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -527,8 +527,10 @@ def process(action, *args)
          @request.set_header k, @controller.config.relative_url_root
        end

+        begin
          @controller.recycle!
          @controller.dispatch(action, @request, @response)
+        ensure
          @request = @controller.request
          @response = @controller.response

@@ -555,6 +557,7 @@ def process(action, *args)
          @request.query_string = ''

          @response.sent!
+        end

        @response
      end

--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -154,6 +154,10 @@ def test_with_body
      render html: '<body class="foo"></body>'.html_safe
    end

+    def boom
+      raise 'boom!'
+    end
+
    private

      def generate_url(opts)
@@ -981,6 +985,26 @@ def test_redirect_url_only_cares_about_location_header
      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