:warning: "Use assert_nil if expecting nil. This will fail in MT6."

These are followups for 307065f959f2b34bdad16487bae906eb3bfeaf28,
but TBH I'm personally not very much confortable with this style.
Maybe we could override assert_equal in our test_helper not to warn?

2 files changed, 22 insertions, 10 deletions

diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb
index 82d7530e9f..8920914af1 100644
--- a/actionpack/test/controller/parameters/parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -66,12 +66,20 @@ class ParametersPermitTest < ActiveSupport::TestCase
     values.each do |value|
       params = ActionController::Parameters.new(id: value)
       permitted = params.permit(:id)
-      assert_equal value, permitted[:id]
+      if value.nil?
+        assert_nil permitted[:id]
+      else
+        assert_equal value, permitted[:id]
+      end
 
       @struct_fields.each do |sf|
         params = ActionController::Parameters.new(sf => value)
         permitted = params.permit(:sf)
-        assert_equal value, permitted[sf]
+        if value.nil?
+          assert_nil permitted[sf]
+        else
+          assert_equal value, permitted[sf]
+        end
       end
     end
   end
diff --git a/actionpack/test/controller/request/test_request_test.rb b/actionpack/test/controller/request/test_request_test.rb
index b67ae72c0a..1440db00f6 100644
--- a/actionpack/test/controller/request/test_request_test.rb
+++ b/actionpack/test/controller/request/test_request_test.rb
@@ -21,16 +21,20 @@ class ActionController::TestRequestTest < ActionController::TestCase
                  @request.get_header("CONTENT_LENGTH"))
   end
 
-  ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS.each_key do |option|
-    test "rack default session options #{option} exists in session options and is default" do
-      assert_equal(ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS[option],
-                   @request.session_options[option],
-                   "Missing rack session default option #{option} in request.session_options")
+  ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS.each_pair do |key, value|
+    test "rack default session options #{key} exists in session options and is default" do
+      if value.nil?
+        assert_nil(@request.session_options[key],
+                   "Missing rack session default option #{key} in request.session_options")
+      else
+        assert_equal(value, @request.session_options[key],
+                     "Missing rack session default option #{key} in request.session_options")
+      end
     end
 
-    test "rack default session options #{option} exists in session options" do
-      assert(@request.session_options.has_key?(option),
-                   "Missing rack session option #{option} in request.session_options")
+    test "rack default session options #{key} exists in session options" do
+      assert(@request.session_options.has_key?(key),
+                   "Missing rack session option #{key} in request.session_options")
     end
   end
 end