From aaef6a3860e3952faf551d25076f42ea7f6ff426 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 8 Aug 2014 12:29:52 +0800
Subject: [PATCH] Fixes to TestCaseTest.

---
 actionpack/test/controller/test_case_test.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index a9ed5021bb..060c940100 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -713,6 +713,7 @@ def test_remote_addr
   def test_header_properly_reset_after_remote_http_request
     xhr :get, :test_params
     assert_nil @request.env['HTTP_X_REQUESTED_WITH']
+    assert_nil @request.env['HTTP_ACCEPT']
   end
 
   def test_header_properly_reset_after_get_request
@@ -721,10 +722,10 @@ def test_header_properly_reset_after_get_request
     assert_nil @request.instance_variable_get("@request_method")
   end
 
-  def test_params_reset_after_post_request
+  def test_params_reset_between_post_requests
     post :no_op, :foo => "bar"
     assert_equal "bar", @request.params[:foo]
-    @request.recycle!
+
     post :no_op
     assert @request.params[:foo].blank?
   end
@@ -737,10 +738,10 @@ def test_filtered_parameters_reset_between_requests
     assert_equal "baz", @request.filtered_parameters[:foo]
   end
 
-  def test_path_params_reset_after_request
+  def test_path_params_reset_between_request
     get :test_params, :id => "foo"
     assert_equal "foo", @request.path_parameters[:id]
-    @request.recycle!
+
     get :test_params
     assert_nil @request.path_parameters[:id]
   end