Merge branch 'master' into pr/18316

Conflicts:
	activerecord/CHANGELOG.md

1 files changed, 2 insertions, 2 deletions

diff --git a/actionpack/test/controller/permitted_params_test.rb b/actionpack/test/controller/permitted_params_test.rb
index f46249d712..7136fafae5 100644
--- a/actionpack/test/controller/permitted_params_test.rb
+++ b/actionpack/test/controller/permitted_params_test.rb
@@ -14,12 +14,12 @@ class ActionControllerPermittedParamsTest < ActionController::TestCase
   tests PeopleController
 
   test "parameters are forbidden" do
-    post :create, { person: { name: "Mjallo!" } }
+    post :create, params: { person: { name: "Mjallo!" } }
     assert_equal "forbidden", response.body
   end
 
   test "parameters can be permitted and are then not forbidden" do
-    post :create_with_permit, { person: { name: "Mjallo!" } }
+    post :create_with_permit, params: { person: { name: "Mjallo!" } }
     assert_equal "permitted", response.body
   end
 end