6 files changed, 10 insertions, 5 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index fb60dbd993..e3f669dbb5 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -93,7 +93,7 @@ end
 class ControllerInstanceTests < ActiveSupport::TestCase
   def setup
     @empty = EmptyController.new
-    @empty.set_request!(ActionDispatch::Request.new({}))
+    @empty.set_request!(ActionDispatch::Request.empty)
     @empty.set_response!(EmptyController.make_response!(@empty.request))
     @contained = Submodule::ContainedEmptyController.new
     @empty_controllers = [@empty, @contained]
diff --git a/actionpack/test/controller/new_base/bare_metal_test.rb b/actionpack/test/controller/new_base/bare_metal_test.rb
index e61f4d241b..c226fa57ee 100644
--- a/actionpack/test/controller/new_base/bare_metal_test.rb
+++ b/actionpack/test/controller/new_base/bare_metal_test.rb
@@ -26,7 +26,7 @@ module BareMetalTest
 
     test "response_body value is wrapped in an array when the value is a String" do
       controller = BareController.new
-      controller.set_request!(ActionDispatch::Request.new({}))
+      controller.set_request!(ActionDispatch::Request.empty)
       controller.set_response!(BareController.make_response!(controller.request))
       controller.index
       assert_equal ["Hello world"], controller.response_body
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 84c244c72a..dfcef14344 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -7,7 +7,7 @@ class CookieJarTest < ActiveSupport::TestCase
   attr_reader :request
 
   def setup
-    @request = ActionDispatch::Request.new({})
+    @request = ActionDispatch::Request.empty
   end
 
   def test_fetch
diff --git a/actionpack/test/dispatch/live_response_test.rb b/actionpack/test/dispatch/live_response_test.rb
index 160cdc1582..e4475f4233 100644
--- a/actionpack/test/dispatch/live_response_test.rb
+++ b/actionpack/test/dispatch/live_response_test.rb
@@ -6,7 +6,7 @@ module ActionController
     class ResponseTest < ActiveSupport::TestCase
       def setup
         @response = Live::Response.new
-        @response.request = ActionDispatch::Request.new({}) #yolo
+        @response.request = ActionDispatch::Request.empty
       end
 
       def test_header_merge
diff --git a/actionpack/test/dispatch/request/session_test.rb b/actionpack/test/dispatch/request/session_test.rb
index ae0e7e93ed..7dcbcc5c21 100644
--- a/actionpack/test/dispatch/request/session_test.rb
+++ b/actionpack/test/dispatch/request/session_test.rb
@@ -7,7 +7,7 @@ module ActionDispatch
       attr_reader :req
 
       def setup
-        @req = ActionDispatch::Request.new({})
+        @req = ActionDispatch::Request.empty
       end
 
       def test_create_adds_itself_to_env
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 981d820ccf..c37679bc5f 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -5,6 +5,7 @@ require 'rack/content_length'
 class ResponseTest < ActiveSupport::TestCase
   def setup
     @response = ActionDispatch::Response.create
+    @response.request = ActionDispatch::Request.empty
   end
 
   def test_can_wait_until_commit
@@ -39,6 +40,7 @@ class ResponseTest < ActiveSupport::TestCase
   def test_response_body_encoding
     body = ["hello".encode(Encoding::UTF_8)]
     response = ActionDispatch::Response.new 200, {}, body
+    response.request = ActionDispatch::Request.empty
     assert_equal Encoding::UTF_8, response.body.encoding
   end
 
@@ -261,6 +263,7 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "can be explicitly destructured into status, headers and an enumerable body" do
     response = ActionDispatch::Response.new(404, { 'Content-Type' => 'text/plain' }, ['Not Found'])
+    response.request = ActionDispatch::Request.empty
     status, headers, body = *response
 
     assert_equal 404, status
@@ -356,6 +359,7 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
         resp.cache_control[:public] = true
         resp.etag = '123'
         resp.body = 'Hello'
+        resp.request = ActionDispatch::Request.empty
       }.to_a
     }
 
@@ -392,6 +396,7 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
         resp.charset = 'utf-16'
         resp.content_type = Mime[:xml]
         resp.body = 'Hello'
+        resp.request = ActionDispatch::Request.empty
       }.to_a
     }