1 files changed, 5 insertions, 14 deletions
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 86ffb898ad..531b9b0a81 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -49,7 +49,7 @@ class TestCaseTest < ActionController::TestCase
     end
 
     def test_query_parameters
-      render text: request.query_parameters.inspect
+      render text: ::JSON.dump(request.query_parameters)
     end
 
     def test_request_parameters
@@ -158,8 +158,6 @@ XML
   def setup
     super
     @controller = TestController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     @request.env['PATH_INFO'] = nil
     @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
       r.draw do
@@ -516,8 +514,8 @@ XML
 
   def test_query_param_named_action
     get :test_query_parameters, params: {action: 'foobar'}
-    parsed_params = eval(@response.body)
-    assert_equal({action: 'foobar'}, parsed_params)
+    parsed_params = JSON.parse(@response.body)
+    assert_equal({'action' => 'foobar'}, parsed_params)
   end
 
   def test_request_param_named_action
@@ -720,12 +718,6 @@ XML
     assert_equal 'it works', session[:symbol], "Test session hash should allow indifferent access"
   end
 
-  def test_header_properly_reset_after_get_request
-    get :test_params
-    @request.recycle!
-    assert_nil @request.instance_variable_get("@request_method")
-  end
-
   def test_deprecated_params_reset_between_post_requests
     assert_deprecated { post :no_op, foo: "bar" }
     assert_equal "bar", @request.params[:foo]
@@ -957,10 +949,11 @@ class ResponseDefaultHeadersTest < ActionController::TestCase
     end
   end
 
-  setup do
+  def before_setup
     @original = ActionDispatch::Response.default_headers
     @defaults = { 'A' => '1', 'B' => '2' }
     ActionDispatch::Response.default_headers = @defaults
+    super
   end
 
   teardown do
@@ -970,8 +963,6 @@ class ResponseDefaultHeadersTest < ActionController::TestCase
   def setup
     super
     @controller = TestController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     @request.env['PATH_INFO'] = nil
     @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
       r.draw do