"Use assert_nil if expecting nil. This will fail in minitest 6."

3 files changed, 7 insertions, 7 deletions

diff --git a/actionpack/test/dispatch/session/cache_store_test.rb b/actionpack/test/dispatch/session/cache_store_test.rb
index a60629a7ee..859059063f 100644
--- a/actionpack/test/dispatch/session/cache_store_test.rb
+++ b/actionpack/test/dispatch/session/cache_store_test.rb
@@ -142,20 +142,20 @@ class CacheStoreTest < ActionDispatch::IntegrationTest
 
       get "/get_session_value"
       assert_response :success
-      assert_equal nil, headers["Set-Cookie"], "should not resend the cookie again if session_id cookie is already exists"
+      assert_nil headers["Set-Cookie"], "should not resend the cookie again if session_id cookie is already exists"
     end
   end
 
   def test_prevents_session_fixation
     with_test_route_set do
-      assert_equal nil, @cache.read("_session_id:0xhax")
+      assert_nil @cache.read("_session_id:0xhax")
 
       cookies["_session_id"] = "0xhax"
       get "/set_session_value"
 
       assert_response :success
       assert_not_equal "0xhax", cookies["_session_id"]
-      assert_equal nil, @cache.read("_session_id:0xhax")
+      assert_nil @cache.read("_session_id:0xhax")
       assert_equal({ "foo" => "bar" }, @cache.read("_session_id:#{cookies['_session_id']}"))
     end
   end
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 013d289c6d..2a1053be16 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -108,7 +108,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
     with_test_route_set(secure: true) do
       get "/set_session_value"
       assert_response :success
-      assert_equal nil, headers["Set-Cookie"]
+      assert_nil headers["Set-Cookie"]
     end
   end
 
@@ -169,7 +169,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
     with_test_route_set do
       get "/no_session_access"
       assert_response :success
-      assert_equal nil, headers["Set-Cookie"]
+      assert_nil headers["Set-Cookie"]
     end
   end
 
@@ -179,7 +179,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
         "fef868465920f415f2c0652d6910d3af288a0367"
       get "/no_session_access"
       assert_response :success
-      assert_equal nil, headers["Set-Cookie"]
+      assert_nil headers["Set-Cookie"]
     end
   end
 
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index c2d0719b4e..121e9ebef7 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -157,7 +157,7 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
 
         get "/get_session_value"
         assert_response :success
-        assert_equal nil, headers["Set-Cookie"], "should not resend the cookie again if session_id cookie is already exists"
+        assert_nil headers["Set-Cookie"], "should not resend the cookie again if session_id cookie is already exists"
       end
     rescue Dalli::RingError => ex
       skip ex.message, ex.backtrace