Merge branch 'master' into update_default_hsts_max_age

1 files changed, 18 insertions, 19 deletions

diff --git a/actionpack/test/controller/parameters/mutators_test.rb b/actionpack/test/controller/parameters/mutators_test.rb
index 49dede03c2..312b1e5b27 100644
--- a/actionpack/test/controller/parameters/mutators_test.rb
+++ b/actionpack/test/controller/parameters/mutators_test.rb
@@ -2,7 +2,6 @@
 
 require "abstract_unit"
 require "action_controller/metal/strong_parameters"
-require "active_support/core_ext/hash/transform_values"
 
 class ParametersMutatorsTest < ActiveSupport::TestCase
   setup do
@@ -20,11 +19,11 @@ class ParametersMutatorsTest < ActiveSupport::TestCase
 
   test "delete retains permitted status" do
     @params.permit!
-    assert @params.delete(:person).permitted?
+    assert_predicate @params.delete(:person), :permitted?
   end
 
   test "delete retains unpermitted status" do
-    assert_not @params.delete(:person).permitted?
+    assert_not_predicate @params.delete(:person), :permitted?
   end
 
   test "delete returns the value when the key is present" do
@@ -50,73 +49,73 @@ class ParametersMutatorsTest < ActiveSupport::TestCase
 
   test "delete_if retains permitted status" do
     @params.permit!
-    assert @params.delete_if { |k| k == "person" }.permitted?
+    assert_predicate @params.delete_if { |k| k == "person" }, :permitted?
   end
 
   test "delete_if retains unpermitted status" do
-    assert_not @params.delete_if { |k| k == "person" }.permitted?
+    assert_not_predicate @params.delete_if { |k| k == "person" }, :permitted?
   end
 
   test "extract! retains permitted status" do
     @params.permit!
-    assert @params.extract!(:person).permitted?
+    assert_predicate @params.extract!(:person), :permitted?
   end
 
   test "extract! retains unpermitted status" do
-    assert_not @params.extract!(:person).permitted?
+    assert_not_predicate @params.extract!(:person), :permitted?
   end
 
   test "keep_if retains permitted status" do
     @params.permit!
-    assert @params.keep_if { |k, v| k == "person" }.permitted?
+    assert_predicate @params.keep_if { |k, v| k == "person" }, :permitted?
   end
 
   test "keep_if retains unpermitted status" do
-    assert_not @params.keep_if { |k, v| k == "person" }.permitted?
+    assert_not_predicate @params.keep_if { |k, v| k == "person" }, :permitted?
   end
 
   test "reject! retains permitted status" do
     @params.permit!
-    assert @params.reject! { |k| k == "person" }.permitted?
+    assert_predicate @params.reject! { |k| k == "person" }, :permitted?
   end
 
   test "reject! retains unpermitted status" do
-    assert_not @params.reject! { |k| k == "person" }.permitted?
+    assert_not_predicate @params.reject! { |k| k == "person" }, :permitted?
   end
 
   test "select! retains permitted status" do
     @params.permit!
-    assert @params.select! { |k| k != "person" }.permitted?
+    assert_predicate @params.select! { |k| k != "person" }, :permitted?
   end
 
   test "select! retains unpermitted status" do
-    assert_not @params.select! { |k| k != "person" }.permitted?
+    assert_not_predicate @params.select! { |k| k != "person" }, :permitted?
   end
 
   test "slice! retains permitted status" do
     @params.permit!
-    assert @params.slice!(:person).permitted?
+    assert_predicate @params.slice!(:person), :permitted?
   end
 
   test "slice! retains unpermitted status" do
-    assert_not @params.slice!(:person).permitted?
+    assert_not_predicate @params.slice!(:person), :permitted?
   end
 
   test "transform_keys! retains permitted status" do
     @params.permit!
-    assert @params.transform_keys! { |k| k }.permitted?
+    assert_predicate @params.transform_keys! { |k| k }, :permitted?
   end
 
   test "transform_keys! retains unpermitted status" do
-    assert_not @params.transform_keys! { |k| k }.permitted?
+    assert_not_predicate @params.transform_keys! { |k| k }, :permitted?
   end
 
   test "transform_values! retains permitted status" do
     @params.permit!
-    assert @params.transform_values! { |v| v }.permitted?
+    assert_predicate @params.transform_values! { |v| v }, :permitted?
   end
 
   test "transform_values! retains unpermitted status" do
-    assert_not @params.transform_values! { |v| v }.permitted?
+    assert_not_predicate @params.transform_values! { |v| v }, :permitted?
   end
 end