aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorMikhail Vaysman <9996113+github@gmail.com>2012-05-25 16:58:43 +0400
committerMikhail Vaysman <9996113+github@gmail.com>2012-05-25 16:58:43 +0400
commit17eedd8e07d01a72ea11b9ee616c7dfdea4dc9ef (patch)
tree009b38db89ea472fdec003b5bac351ec0f0258bb /actionpack
parent05ae220d2e3de751486951a88800e98f0c1014fa (diff)
downloadrails-17eedd8e07d01a72ea11b9ee616c7dfdea4dc9ef.tar.gz
rails-17eedd8e07d01a72ea11b9ee616c7dfdea4dc9ef.tar.bz2
rails-17eedd8e07d01a72ea11b9ee616c7dfdea4dc9ef.zip
references to the old behavior removed
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 08fd28d72d..3fdc6688c2 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -17,8 +17,8 @@ module ActionDispatch
# a Hash, or a String that is appropriately encoded
# (<tt>application/x-www-form-urlencoded</tt> or
# <tt>multipart/form-data</tt>).
- # - +headers+: Additional HTTP headers to pass, as a Hash. The keys will
- # automatically be upcased, with the prefix 'HTTP_' added if needed.
+ # - +headers+: Additional headers to pass, as a Hash. The headers will be
+ # merged into the Rack env hash.
#
# This method returns an Response object, which one can use to
# inspect the details of the response. Furthermore, if this method was
@@ -73,8 +73,7 @@ module ActionDispatch
#
# The request_method is +:get+, +:post+, +:patch+, +:put+, +:delete+ or
# +:head+; the 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.
+ # string; the headers are a hash.
def xml_http_request(request_method, path, parameters = nil, headers = nil)
headers ||= {}
headers['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'