mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Make :as option also set request format (AC::TestCase)
right now you'd have to specify both :as and :format: ``` post :create, params: { foo: "bar" } as: :json, format: :json ```
This commit is contained in:
parent
cf5f55cd30
commit
aa7c4179ff
2 changed files with 9 additions and 4 deletions
|
@ -498,10 +498,6 @@ module ActionController
|
||||||
|
|
||||||
parameters ||= {}
|
parameters ||= {}
|
||||||
|
|
||||||
if format
|
|
||||||
parameters[:format] = format
|
|
||||||
end
|
|
||||||
|
|
||||||
@html_document = nil
|
@html_document = nil
|
||||||
|
|
||||||
cookies.update(@request.cookies)
|
cookies.update(@request.cookies)
|
||||||
|
@ -521,6 +517,10 @@ module ActionController
|
||||||
format ||= as
|
format ||= as
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if format
|
||||||
|
parameters[:format] = format
|
||||||
|
end
|
||||||
|
|
||||||
parameters = parameters.symbolize_keys
|
parameters = parameters.symbolize_keys
|
||||||
|
|
||||||
generated_extras = @routes.generate_extras(parameters.merge(controller: controller_class_name, action: action.to_s))
|
generated_extras = @routes.generate_extras(parameters.merge(controller: controller_class_name, action: action.to_s))
|
||||||
|
|
|
@ -646,6 +646,11 @@ XML
|
||||||
assert_equal 2, @request.request_parameters[:num_value]
|
assert_equal 2, @request.request_parameters[:num_value]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_using_as_json_sets_format_json
|
||||||
|
post :render_body, params: { bool_value: true, str_value: "string", num_value: 2 }, as: :json
|
||||||
|
assert_equal "json", @request.format
|
||||||
|
end
|
||||||
|
|
||||||
def test_mutating_content_type_headers_for_plain_text_files_sets_the_header
|
def test_mutating_content_type_headers_for_plain_text_files_sets_the_header
|
||||||
@request.headers["Content-Type"] = "text/plain"
|
@request.headers["Content-Type"] = "text/plain"
|
||||||
post :render_body, params: { name: "foo.txt" }
|
post :render_body, params: { name: "foo.txt" }
|
||||||
|
|
Loading…
Reference in a new issue