Merge pull request #26003 from darkbaby123/fix_xhr_overwrite_headers_in_test

Fix Accept header overwritten issue when "xhr: true" in integration test

1 files changed, 7 insertions, 4 deletions

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 3008d10992..9be3759556 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -366,14 +366,17 @@ module ActionDispatch
             "HTTP_ACCEPT"    => accept
           }
 
+          wrapped_headers = Http::Headers.from_hash({})
+          wrapped_headers.merge!(headers) if headers
+
           if xhr
-            headers["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest"
-            headers["HTTP_ACCEPT"] ||= [Mime[:js], Mime[:html], Mime[:xml], "text/xml", "*/*"].join(", ")
+            wrapped_headers["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest"
+            wrapped_headers["HTTP_ACCEPT"] ||= [Mime[:js], Mime[:html], Mime[:xml], "text/xml", "*/*"].join(", ")
           end
 
           # this modifies the passed request_env directly
-          if headers.present?
-            Http::Headers.from_hash(request_env).merge!(headers)
+          if wrapped_headers.present?
+            Http::Headers.from_hash(request_env).merge!(wrapped_headers)
           end
           if env.present?
             Http::Headers.from_hash(request_env).merge!(env)