aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2018-08-29 14:07:37 +0930
committerGitHub <noreply@github.com>2018-08-29 14:07:37 +0930
commit068fe7dc9045856b822833db5cb7cb690e6000d7 (patch)
treee9c6ce3a42e29e09bb899b6e4c7e695d97b3c428 /actionpack/test
parent28e5085070f95f32a6a909cce6d77fd460c73885 (diff)
parent7c9751d7fe3aec1e67004d1bb5e4a1702fcacafb (diff)
downloadrails-068fe7dc9045856b822833db5cb7cb690e6000d7.tar.gz
rails-068fe7dc9045856b822833db5cb7cb690e6000d7.tar.bz2
rails-068fe7dc9045856b822833db5cb7cb690e6000d7.zip
Merge pull request #33718 from kddeisz/permit-list
Finish converting whitelist and blacklist references
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/parameters/always_permitted_parameters_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
index fe0e5e368d..974612fb7b 100644
--- a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
+++ b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
@@ -20,7 +20,7 @@ class AlwaysPermittedParametersTest < ActiveSupport::TestCase
end
end
- test "permits parameters that are whitelisted" do
+ test "allows both explicitly listed and always-permitted parameters" do
params = ActionController::Parameters.new(
book: { pages: 65 },
format: "json")