aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing/integration.rb
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2016-08-05 14:20:21 -0400
committereileencodes <eileencodes@gmail.com>2016-08-05 15:43:39 -0400
commitaf1680f51c127c7e40019e68c01b2a693ba2640f (patch)
tree323cb7099ca25dc407bd83bfdb267c95e9b49cac /actionpack/lib/action_dispatch/testing/integration.rb
parent70f2f981503d4f08b48ae0a05cf0e69308e1aba0 (diff)
downloadrails-af1680f51c127c7e40019e68c01b2a693ba2640f.tar.gz
rails-af1680f51c127c7e40019e68c01b2a693ba2640f.tar.bz2
rails-af1680f51c127c7e40019e68c01b2a693ba2640f.zip
Fix GET JSON integration test request to use method override
When a `GET` request is sent `as: :json` in an integration test the test should use Rack's method override to change to a post request so the paramters are included in the postdata. Otherwise it will not encode the parameters correctly for the integration test. Because integration test sets up it's own middleware, `Rack::MethodOverride` needs to be included in the integration tests as well. `headers ||= {}` was moved so that headers are never nil. They should default to a hash. Fixes #26033 [Eileen M. Uchitelle & Aaron Patterson]
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 9a76b68ae1..c8ad8cee68 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -327,6 +327,12 @@ module ActionDispatch
# Performs the actual request.
def process(method, path, params: nil, headers: nil, env: nil, xhr: false, as: nil)
request_encoder = RequestEncoder.encoder(as)
+ headers ||= {}
+
+ if method == :get && as == :json && params
+ headers['X-Http-Method-Override'] = 'GET'
+ method = :post
+ end
if path =~ %r{://}
path = build_expanded_path(path, request_encoder) do |location|
@@ -361,7 +367,6 @@ module ActionDispatch
}
if xhr
- headers ||= {}
headers['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
headers['HTTP_ACCEPT'] ||= [Mime[:js], Mime[:html], Mime[:xml], 'text/xml', '*/*'].join(', ')
end