Ticket #7124: alias_xhr_to_xml_http_request.diff

actionpack/test/controller/integration_test.rb

@@ -141 +141 @@
-    @session.expects(:post).with(path,params,headers_after_xhr)
-    @session.xml_http_request(path,params,headers)
-  end
+
+  def test_xhr_is_aliased_to_xml_http_request
+    path = "/index"; 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(:post).with(path,params,headers_after_xhr)
+    @session.xhr(path,params,headers)
+  end 
+
+    
-end
-
-# TODO

actionpack/lib/action_controller/integration.rb

@@ -186 +186 @@
-
-        post(path, parameters, headers)
-      end
+      
+      alias xhr :xml_http_request
-
-      # Returns the URL for the given options, according to the rules specified
-      # in the application's routes.
@@ -500 +502 @@
-        end
-      end
-    end
+    
+    alias xhr :xml_http_request
-
-    # Open a new session instance. If a block is given, the new session is
-    # yielded to the block before being returned.