1 files changed, 1 insertions, 12 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_response.rb b/actionpack/lib/action_dispatch/testing/test_response.rb
index 369ea1467c..a9b88ac5fd 100644
--- a/actionpack/lib/action_dispatch/testing/test_response.rb
+++ b/actionpack/lib/action_dispatch/testing/test_response.rb
@@ -7,11 +7,7 @@ module ActionDispatch
   # See Response for more information on controller response objects.
   class TestResponse < Response
     def self.from_response(response)
-      new.tap do |resp|
-        resp.status  = response.status
-        resp.headers = response.headers
-        resp.body    = response.body
-      end
+      new response.status, response.headers, response.body, default_headers: nil
     end
 
     # Was the response successful?
@@ -25,12 +21,5 @@ module ActionDispatch
 
     # Was there a server-side error?
     alias_method :error?, :server_error?
-
-    def merge_default_headers(original, *args)
-      # Default headers are already applied, no need to merge them a second time.
-      # This makes sure that default headers, removed in controller actions, will
-      # not be reapplied to the test response.
-      original
-    end
   end
 end