aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-07 18:14:33 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-07 18:16:59 -0300
commit4147e0feaddac0e86c9b1f52eec4b1e33d7d6591 (patch)
tree837b8c9164e280acacb6efe7c5bcaa84a5f3625d
parentc35853f0440e00b153153a139ea5f66a1138035a (diff)
downloadrails-4147e0feaddac0e86c9b1f52eec4b1e33d7d6591.tar.gz
rails-4147e0feaddac0e86c9b1f52eec4b1e33d7d6591.tar.bz2
rails-4147e0feaddac0e86c9b1f52eec4b1e33d7d6591.zip
Remove references to old behavior with headers at
ActionDispatch::Integration::ResquestHelpers. The behavior has removed at 4a6f4b92ad2f48dc7906d223fe4708d36624bd50 to increase the compatibility with Rack::Test Closes #7136 [ci skip]
-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 ac784b3b60..a4c6c84939 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -18,8 +18,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
@@ -62,8 +62,7 @@ module ActionDispatch
#
# The request_method is +:get+, +:post+, +: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.
+ # the headers are a hash.
def xml_http_request(request_method, path, parameters = nil, headers = nil)
headers ||= {}
headers['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'