"Use assert_nil if expecting nil from ...:in `...'. This will fail in MT6."

actionpack/test/controller/flash_hash_test.rb

@@ -63,10 +63,10 @@ def test_to_session_value
       assert_equal({ "flashes" => { "foo" => "bar" }, "discard" => [] }, @hash.to_session_value)
 
       @hash.discard("foo")
-      assert_equal(nil, @hash.to_session_value)
+      assert_nil(@hash.to_session_value)
 
       @hash.sweep
-      assert_equal(nil, @hash.to_session_value)
+      assert_nil(@hash.to_session_value)
     end
 
     def test_from_session_value
@@ -75,7 +75,7 @@ def test_from_session_value
       session = Marshal.load(Base64.decode64(rails_3_2_cookie))
       hash = Flash::FlashHash.from_session_value(session["flash"])
       assert_equal({ "greeting" => "Hello" }, hash.to_hash)
-      assert_equal(nil, hash.to_session_value)
+      assert_nil(hash.to_session_value)
     end
 
     def test_from_session_value_on_json_serializer
@@ -84,7 +84,7 @@ def test_from_session_value_on_json_serializer
       hash = Flash::FlashHash.from_session_value(session["flash"])
 
       assert_equal({ "greeting" => "Hello" }, hash.to_hash)
-      assert_equal(nil, hash.to_session_value)
+      assert_nil(hash.to_session_value)
       assert_equal "Hello", hash[:greeting]
       assert_equal "Hello", hash["greeting"]
     end

activerecord/test/cases/adapters/mysql2/json_test.rb

@@ -93,7 +93,7 @@ def test_select_multikey
     def test_null_json
       @connection.execute "insert into json_data_type (payload) VALUES(null)"
       x = JsonDataType.first
-      assert_equal(nil, x.payload)
+      assert_nil(x.payload)
     end
 
     def test_select_array_json_value
@@ -111,7 +111,7 @@ def test_select_nil_json_after_create
     def test_select_nil_json_after_update
       json = JsonDataType.create(payload: "foo")
       x = JsonDataType.where(payload: nil).first
-      assert_equal(nil, x)
+      assert_nil(x)
 
       json.update_attributes payload: nil
       x = JsonDataType.where(payload: nil).first

activerecord/test/cases/adapters/postgresql/bytea_test.rb

@@ -52,7 +52,7 @@ def test_type_cast_binary_value
   end
 
   def test_type_case_nil
-    assert_equal(nil, @type.deserialize(nil))
+    assert_nil(@type.deserialize(nil))
   end
 
   def test_read_value
@@ -66,7 +66,7 @@ def test_read_value
   def test_read_nil_value
     @connection.execute "insert into bytea_data_type (payload) VALUES (null)"
     record = ByteaDataType.first
-    assert_equal(nil, record.payload)
+    assert_nil(record.payload)
     record.delete
   end
 
@@ -106,8 +106,8 @@ def test_write_binary
   def test_write_nil
     record = ByteaDataType.create(payload: nil)
     assert_not record.new_record?
-    assert_equal(nil, record.payload)
-    assert_equal(nil, ByteaDataType.where(id: record.id).first.payload)
+    assert_nil(record.payload)
+    assert_nil(ByteaDataType.where(id: record.id).first.payload)
   end
 
   class Serializer

activerecord/test/cases/adapters/postgresql/json_test.rb

@@ -110,7 +110,7 @@ def test_select_multikey
   def test_null_json
     @connection.execute "insert into json_data_type (payload) VALUES(null)"
     x = JsonDataType.first
-    assert_equal(nil, x.payload)
+    assert_nil(x.payload)
   end
 
   def test_select_nil_json_after_create
@@ -122,7 +122,7 @@ def test_select_nil_json_after_create
   def test_select_nil_json_after_update
     json = JsonDataType.create(payload: "foo")
     x = JsonDataType.where(payload: nil).first
-    assert_equal(nil, x)
+    assert_nil(x)
 
     json.update_attributes payload: nil
     x = JsonDataType.where(payload: nil).first

activerecord/test/cases/adapters/postgresql/uuid_test.rb

@@ -71,12 +71,12 @@ def test_data_type_of_uuid_types
 
   def test_treat_blank_uuid_as_nil
     UUIDType.create! guid: ""
-    assert_equal(nil, UUIDType.last.guid)
+    assert_nil(UUIDType.last.guid)
   end
 
   def test_treat_invalid_uuid_as_nil
     uuid = UUIDType.create! guid: "foobar"
-    assert_equal(nil, uuid.guid)
+    assert_nil(uuid.guid)
   end
 
   def test_invalid_uuid_dont_modify_before_type_cast

activesupport/test/core_ext/hash_ext_test.rb

@@ -1017,7 +1017,7 @@ def test_compact!
     assert_equal({}, h)
 
     h = @symbols.dup
-    assert_equal(nil, h.compact!)
+    assert_nil(h.compact!)
     assert_equal(@symbols, h)
   end