aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2018-12-18 21:07:43 +0100
committerGitHub <noreply@github.com>2018-12-18 21:07:43 +0100
commit35e0190ac54ec852f8ff5b9196ccf8a24e8d193b (patch)
tree5f7b0d46ad3764de86a9d66db9fdbeec6aa30baa /actionpack/lib
parent96dee049c479c4ddd40d8a22ed0ec72fdda07d5b (diff)
parenteb37fd0aec4fdc5122ceeb8a56b1e9b0cb5e3b76 (diff)
downloadrails-35e0190ac54ec852f8ff5b9196ccf8a24e8d193b.tar.gz
rails-35e0190ac54ec852f8ff5b9196ccf8a24e8d193b.tar.bz2
rails-35e0190ac54ec852f8ff5b9196ccf8a24e8d193b.zip
Merge pull request #34737 from r7kamura/feature/test-case-params-nil
Allow nil params on controller HTTP test methods
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/test_case.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 5d784ceb31..a643484d96 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -457,7 +457,7 @@ module ActionController
# respectively which will make tests more expressive.
#
# Note that the request method is not verified.
- def process(action, method: "GET", params: {}, session: nil, body: nil, flash: {}, format: nil, xhr: false, as: nil)
+ def process(action, method: "GET", params: nil, session: nil, body: nil, flash: {}, format: nil, xhr: false, as: nil)
check_required_ivars
http_method = method.to_s.upcase
@@ -485,7 +485,7 @@ module ActionController
format ||= as
end
- parameters = params.symbolize_keys
+ parameters = (params || {}).symbolize_keys
if format
parameters[:format] = format