Permalink
Browse files

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]
  • Loading branch information...
eileencodes committed Aug 5, 2016
1 parent 70f2f98 commit af1680f51c127c7e40019e68c01b2a693ba2640f
@@ -327,6 +327,12 @@ def non_kwarg_request_warning
# 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 @@ def process(method, path, params: nil, headers: nil, env: nil, xhr: false, as: n
}
if xhr
headers ||= {}
headers['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
headers['HTTP_ACCEPT'] ||= [Mime[:js], Mime[:html], Mime[:xml], 'text/xml', '*/*'].join(', ')
end
@@ -104,6 +104,7 @@ def self.build_app(routes = nil)
middleware.use ActionDispatch::Callbacks
middleware.use ActionDispatch::Cookies
middleware.use ActionDispatch::Flash
middleware.use Rack::MethodOverride
middleware.use Rack::Head
yield(middleware) if block_given?
end
@@ -1238,6 +1238,22 @@ def test_get_parameters_with_as_option
end
end
def test_get_request_with_json_uses_method_override_and_sends_a_post_request
with_routing do |routes|
routes.draw do
ActiveSupport::Deprecation.silence do
get ':action' => FooController
end
end
get '/foos_json', params: { foo: 'heyo' }, as: :json
assert_equal 'POST', request.method
assert_equal 'GET', request.headers['X-Http-Method-Override']
assert_equal({ 'foo' => 'heyo' }, response.parsed_body)
end
end
private
def post_to_foos(as:)
with_routing do |routes|

2 comments on commit af1680f

@kaspth

This comment has been minimized.

Show comment
Hide comment
@kaspth

kaspth Aug 7, 2016

Member

@eileencodes @tenderlove heads up: since this is a bug in the 5.0 series I backported this to 5-0-stable as well: 922a066.

Member

kaspth replied Aug 7, 2016

@eileencodes @tenderlove heads up: since this is a bug in the 5.0 series I backported this to 5-0-stable as well: 922a066.

@eileencodes

This comment has been minimized.

Show comment
Hide comment
@eileencodes

eileencodes Aug 7, 2016

Member

thanks @kaspth 👍

Member

eileencodes replied Aug 7, 2016

thanks @kaspth 👍

Please sign in to comment.