Permalink
Browse files

Removed deprecated form of calling xml_http_request/xhr without the f…

…irst argument being the http verb [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7436 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f7b0bc9 commit 46f217b2988a03c977d074565a7d3ac17c789751 @dhh dhh committed Sep 9, 2007
@@ -1,5 +1,7 @@
*SVN*
+* Removed deprecated form of calling xml_http_request/xhr without the first argument being the http verb [DHH]
+
* Removed deprecated methods [DHH]:
- ActionController::Base#keep_flash (use flash.keep instead)
@@ -183,16 +183,7 @@ def head(path, parameters=nil, headers=nil)
# parameters are +nil+, a hash, or a url-encoded or multipart string;
# 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'
headers['Accept'] = 'text/javascript, text/html, application/xml, text/xml, */*'
@@ -130,16 +130,6 @@ def test_head
@session.head(path,params,headers)
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'}
headers_after_xhr = headers.merge(

0 comments on commit 46f217b

Please sign in to comment.