diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-09 23:00:17 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-09 23:00:17 +0000 |
| commit | 46f217b2988a03c977d074565a7d3ac17c789751 (patch) | |
| tree | 2147831a477bf6563485c35219f14dd6f2b93f38 | |
| parent | f7b0bc9ea3d2c729c9d0fbe07c2dbe65e8f6ff5c (diff) | |
| download | rails-46f217b2988a03c977d074565a7d3ac17c789751.tar.gz rails-46f217b2988a03c977d074565a7d3ac17c789751.tar.bz2 rails-46f217b2988a03c977d074565a7d3ac17c789751.zip | |
Removed deprecated form of calling xml_http_request/xhr without the first argument being the http verb [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7436 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 9 | ||||
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 10 |
3 files changed, 2 insertions, 19 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 9b5d4d33bf..dd5de62a67 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -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) diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index 80602489b9..2806485a98 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -183,16 +183,7 @@ module ActionController # 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, */*' diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 6212109c02..d4b3862b2c 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -130,16 +130,6 @@ class SessionTest < Test::Unit::TestCase @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( |