aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorMarc Rendl Ignacio <marcrendlignacio@gmail.com>2017-07-26 13:25:55 +0800
committerMarc Rendl Ignacio <marcrendlignacio@gmail.com>2017-07-27 23:34:01 +0800
commitb1228ad7895c41a74c3a17674fa596779363ff40 (patch)
tree6fe3150bbde96d6918668a3af507c8af7e7f7452 /actionpack/lib/action_dispatch
parent934327e14ee107d531c8a48e297f74a5cd5eb8bb (diff)
downloadrails-b1228ad7895c41a74c3a17674fa596779363ff40.tar.gz
rails-b1228ad7895c41a74c3a17674fa596779363ff40.tar.bz2
rails-b1228ad7895c41a74c3a17674fa596779363ff40.zip
Updates (rdoc) documentation on ActionDispatch::Integration::Session#process
Adds missing information on 2 parameters: +xhr+ and +as+ [ci skip]
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index beba4e3c36..0de978e7cd 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -187,6 +187,12 @@ module ActionDispatch
# merged into the Rack env hash.
# - +env+: Additional env to pass, as a Hash. The headers will be
# merged into the Rack env hash.
+ # - +xhr+: Set to `true` if you want to make and Ajax request.
+ # Adds request headers characteristic of XMLHttpRequest e.g. HTTP_X_REQUESTED_WITH.
+ # The headers will be merged into the Rack env hash.
+ # - +as+: Used for encoding the request with different content type.
+ # Supports `:json` by default and will set the approriate request headers.
+ # The headers will be merged into the Rack env hash.
#
# This method is rarely used directly. Use +#get+, +#post+, or other standard
# HTTP methods in integration tests. +#process+ is only required when using a