1 files changed, 8 insertions, 14 deletions
diff --git a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
index 59be08db54..974612fb7b 100644
--- a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
+++ b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
@@ -1,6 +1,7 @@
-require 'abstract_unit'
-require 'action_controller/metal/strong_parameters'
-require 'minitest/mock'
+# frozen_string_literal: true
+
+require "abstract_unit"
+require "action_controller/metal/strong_parameters"
 
 class AlwaysPermittedParametersTest < ActiveSupport::TestCase
   def setup
@@ -13,24 +14,17 @@ class AlwaysPermittedParametersTest < ActiveSupport::TestCase
     ActionController::Parameters.always_permitted_parameters = %w( controller action )
   end
 
-  test "shows deprecations warning on NEVER_UNPERMITTED_PARAMS" do
-    assert_deprecated do
-      ActionController::Parameters::NEVER_UNPERMITTED_PARAMS
-    end
-  end
-
   test "returns super on missing constant other than NEVER_UNPERMITTED_PARAMS" do
     ActionController::Parameters.superclass.stub :const_missing, "super" do
       assert_equal "super", ActionController::Parameters::NON_EXISTING_CONSTANT
     end
   end
 
-  test "permits parameters that are whitelisted" do
-    params = ActionController::Parameters.new({
+  test "allows both explicitly listed and always-permitted parameters" do
+    params = ActionController::Parameters.new(
       book: { pages: 65 },
-      format: "json"
-    })
+      format: "json")
     permitted = params.permit book: [:pages]
-    assert permitted.permitted?
+    assert_predicate permitted, :permitted?
   end
 end