Changeset 7436

Timestamp:

09/09/07 23:00:17 (2 years ago)

Author:

david

Message:

Removed deprecated form of calling xml_http_request/xhr without the first argument being the http verb [DHH]

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 @@
-*SVN*
+
+* Removed deprecated form of calling xml_http_request/xhr without the first argument being the http verb [DHH]
-
-* Removed deprecated methods [DHH]:

trunk/actionpack/lib/action_controller/integration.rb

@@ -184 +184 @@
-      # the headers are a hash.  Keys are automatically upcased and prefixed
-      # with 'HTTP_' if not already.
-      #
-      # This method used to omit the request_method parameter, assuming it
-      # was :post. This was deprecated in Rails 1.2.4. Always pass the request
-      # method as the first argument.
-      def xml_http_request(request_method, path, parameters = nil, headers = nil)
-        unless request_method.is_a?(Symbol)
-          ActiveSupport::Deprecation.warn 'xml_http_request now takes the request_method (:get, :post, etc.) as the first argument. It used to assume :post, so add the :post argument to your existing method calls to silence this warning.'
-          request_method, path, parameters, headers = :post, request_method, path, parameters
-        end
-
-        headers ||= {}
-        headers['X-Requested-With'] = 'XMLHttpRequest'

trunk/actionpack/test/controller/integration_test.rb

@@ -131 +131 @@
-  end
-
-  def test_xml_http_request_deprecated_call
-    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(:process).with(:post,path,params,headers_after_xhr)
-    assert_deprecated { @session.xml_http_request(path,params,headers) }
-  end
-
-  def test_xml_http_request_get
-    path = "/index"; params = "blah"; headers = {:location => 'blah'}