diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-05-27 11:34:22 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-05-27 11:34:22 +0200 |
| commit | 8c4c55234961cbcd2939ef9c249f07ce698978b3 (patch) | |
| tree | 6169584a0e1c4f0d51ecd2ca63db010554b41043 /actionpack | |
| parent | 656788a8a5a94225a1c8c159299a6da960c0f26e (diff) | |
| parent | aecf182a4b660cc2925bba11e06ba187723d63e4 (diff) | |
| download | rails-8c4c55234961cbcd2939ef9c249f07ce698978b3.tar.gz rails-8c4c55234961cbcd2939ef9c249f07ce698978b3.tar.bz2 rails-8c4c55234961cbcd2939ef9c249f07ce698978b3.zip | |
Merge pull request #25164 from y-yagi/add_missing_as_option_to_deprecation_message
add missing `as` to request kwargs of `ActionDispatch::IntegrationTest`
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 384254b131..8777666f9f 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -300,7 +300,7 @@ module ActionDispatch end end - REQUEST_KWARGS = %i(params headers env xhr) + REQUEST_KWARGS = %i(params headers env xhr as) def kwarg_request?(args) args[0].respond_to?(:keys) && args[0].keys.any? { |k| REQUEST_KWARGS.include?(k) } end @@ -317,7 +317,8 @@ module ActionDispatch params: { id: 1 }, headers: { 'X-Extra-Header' => '123' }, env: { 'action_dispatch.custom' => 'custom' }, - xhr: true + xhr: true, + as: :json MSG end |