aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md9
-rw-r--r--actionpack/lib/action_controller/test_case.rb3
2 files changed, 7 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index aeb961decc..5e0c64900f 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,7 +1,7 @@
* Migrating to keyword arguments syntax in `ActionController::TestCase` and
- `ActionDispatch::Integration` HTTP request methods
+ `ActionDispatch::Integration` HTTP request methods.
- New syntax example:
+ Example:
post :create, params: { y: x }, session: { a: 'b' }
get :view, params: { id: 1 }
@@ -9,7 +9,7 @@
*Kir Shatrov*
-* Preserve default url options when generating URLs
+* Preserve default url options when generating URLs.
Fixes an issue that would cause default_url_options to be lost when
generating URLs with fewer positional arguments than parameters in the
@@ -47,6 +47,7 @@
* Allow you to pass `prepend: false` to protect_from_forgery to have the
verification callback appended instead of prepended to the chain.
This allows you to let the verification step depend on prior callbacks.
+
Example:
class ApplicationController < ActionController::Base
@@ -143,7 +144,7 @@
*Travis Grathwell*
-* Stop converting empty arrays in `params` to `nil`
+* Stop converting empty arrays in `params` to `nil`.
This behaviour was introduced in response to CVE-2012-2660, CVE-2012-2694
and CVE-2013-0155
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 15e587bcea..afe95e3fec 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -579,6 +579,7 @@ module ActionController
# (<tt>application/x-www-form-urlencoded</tt> or <tt>multipart/form-data</tt>).
# - +session+: A hash of parameters to store in the session. This may be +nil+.
# - +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.
#
# Example calling +create+ action and sending two params:
#
@@ -754,7 +755,7 @@ module ActionController
Examples:
get :show, params: { id: 1 }, session: { user_id: 1 }
- process :update, http_method: :post, params: { id: 1 }
+ process :update, method: :post, params: { id: 1 }
MSG
end