Changeset 8426

Timestamp:

12/17/07 00:10:18 (9 months ago)

Author:

david

Message:

Allow headers[Accept] to be set by hand when calling xml_http_request (closes #10461) [BMorearty]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/integration.rb (modified) (1 diff)
• trunk/actionpack/test/controller/integration_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*2.0.2* (December 16th, 2007)
+
+* Allow headers['Accept'] to be set by hand when calling xml_http_request #10461 [BMorearty]
-
-* Added OPTIONS to list of default accepted HTTP methods #10449 [holoway]

trunk/actionpack/lib/action_controller/integration.rb

@@ -188 +188 @@
-        headers ||= {}
-        headers['X-Requested-With'] = 'XMLHttpRequest'
-
+||
-
-        process(request_method, path, parameters, headers)

trunk/actionpack/test/controller/integration_test.rb

@@ -180 +180 @@
-    @session.xml_http_request(:head,path,params,headers)
-  end
+  
+  def test_xml_http_request_override_accept
+    path = "/index"; params = "blah"; headers = {:location => 'blah', "Accept" => "application/xml"}
+    headers_after_xhr = headers.merge(
+      "X-Requested-With" => "XMLHttpRequest"
+    )
+    @session.expects(:process).with(:post,path,params,headers_after_xhr)
+    @session.xml_http_request(:post,path,params,headers)
+  end
-end
-