aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-05-04 17:35:55 +0900
committerGitHub <noreply@github.com>2018-05-04 17:35:55 +0900
commitf4bb51789a9fa23508367100e8d0a7df5cc8b161 (patch)
treeacf36f3c4ba0967d02cad6f65341941d5dfd2e93 /actionpack
parent98c1432583d4607af1467425183d8d448a692c5a (diff)
parentb1228ad7895c41a74c3a17674fa596779363ff40 (diff)
downloadrails-f4bb51789a9fa23508367100e8d0a7df5cc8b161.tar.gz
rails-f4bb51789a9fa23508367100e8d0a7df5cc8b161.tar.bz2
rails-f4bb51789a9fa23508367100e8d0a7df5cc8b161.zip
Merge pull request #29955 from padi/update_actiondispatch_integration_docs
Updates documentation on ActionDispatch::Integration::Session#process [ci skip]
Diffstat (limited to 'actionpack')
-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 7171b6942c..f0398dc7b1 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -189,6 +189,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