Ticket #7124: ticket-7124-integration-session-xhr-normalization.diff

test/controller/integration_test.rb

@@ -134 +134 @@
-    @session.head(path,params,headers)
-  end
-
-
+_deprecated_call
-    path = "/index"; params = "blah"; headers = {:location => 'blah'}
-    headers_after_xhr = headers.merge(
-      "X-Requested-With" => "XMLHttpRequest",
@@ -143 +143 @@
-    @session.expects(:post).with(path,params,headers_after_xhr)
-    @session.xml_http_request(path,params,headers)
-  end
+
+  def test_put_using_xml_http_request
+    path = "/people/3"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "X-Requested-With" => "XMLHttpRequest",
+      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:put).with(path, params, headers_after_xhr)
+    @session.xml_http_request(:put, path, params, headers)
+  end
+
+  def test_delete_using_xml_http_request_alias
+    path = "/people/3"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "X-Requested-With" => "XMLHttpRequest",
+      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:delete).with(path, params, headers_after_xhr)
+    @session.xhr(:delete, path, params, headers)
+  end
-end
-
-# TODO

lib/action_controller/integration.rb

@@ -178 +178 @@
-      # (application/x-www-form-urlencoded or multipart/form-data).  The headers
-      # should be a hash.  The keys will automatically be upcased, with the 
-      # prefix 'HTTP_' added if needed.
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-      end
+      alias xhr :xml_http_request
-
-      # Returns the URL for the given options, according to the rules specified
-      # in the application's routes.