aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-08-19 01:48:56 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-08-19 01:48:56 -0300
commit544d44fb53616ecf475d24b3e395cb9a07e0a70b (patch)
tree1c546edf02e870df1256407a2ef5a91dc2cc5409 /actionpack
parent03b9a11f93e235f803a7029e9a31dd11127f8f3e (diff)
downloadrails-544d44fb53616ecf475d24b3e395cb9a07e0a70b.tar.gz
rails-544d44fb53616ecf475d24b3e395cb9a07e0a70b.tar.bz2
rails-544d44fb53616ecf475d24b3e395cb9a07e0a70b.zip
Copy edits in the documentation [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md8
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
2 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 7d1f67eec0..9dab1cc76a 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,7 +1,9 @@
* Add `:as` option to `ActionController:TestCase#process` and related methods.
-
- Specifying as: :mime_type allows the `CONTENT_TYPE` header to be specified
- in controller tests without manually doing this through `@request.headers...`
+
+ Specifying `as: mime_type` allows the `CONTENT_TYPE` header to be specified
+ in controller tests without manually doing this through `@request.headers['CONTENT_TYPE']`.
+
+ *Everest Stefan Munro-Zeisberger*
* Show cache hits and misses when rendering partials.
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index c7f40fd0e7..11a6cf8e15 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -450,7 +450,7 @@ module ActionController
# - +flash+: A hash of parameters to store in the flash. This may be +nil+.
# - +format+: Request format. Defaults to +nil+. Can be string or symbol.
# - +as+: Content type. Defaults to +nil+. Must be a symbol that corresponds
- # to a mime type
+ # to a mime type.
#
# Example calling +create+ action and sending two params:
#