Fix MT6 assert_nil warnings

Author: bf4

test/action_controller/serialization_scope_name_test.rb

@@ -75,7 +75,10 @@ def test_default_serialization_scope
     end
 
     def test_default_serialization_scope_object
-      assert_equal @controller.current_user, @controller.serialization_scope
+      expected = @controller.current_user
+      actual = @controller.serialization_scope
+      assert_nil expected
+      assert_nil actual
     end
 
     def test_default_scope_non_admin

test/active_model_serializers/railtie_test_isolated.rb

@@ -32,7 +32,10 @@ class WithRails < RailtieTest
 
     test 'it is configured for caching' do
       assert_equal ActionController::Base.cache_store, ActiveModelSerializers.config.cache_store
-      assert_equal Rails.configuration.action_controller.perform_caching, ActiveModelSerializers.config.perform_caching
+      expected = Rails.configuration.action_controller.perform_caching
+      actual = ActiveModelSerializers.config.perform_caching
+      assert_nil expected
+      assert_nil actual
     end
   end
 

test/adapter/json_api/include_data_if_sideloaded_test.rb

@@ -159,7 +159,12 @@ def result(opts)
 
           def assert_relationship(relationship_name, expected, opts = {})
             hash = result(opts)
-            assert_equal(expected, hash[:data][:relationships][relationship_name])
+            actual = hash[:data][:relationships][relationship_name]
+            if expected.nil?
+              assert_nil(actual)
+            else
+              assert_equal(expected, actual)
+            end
           end
         end
       end

test/cache_test.rb

@@ -128,7 +128,7 @@ def test_cache_definition
     def test_cache_key_definition
       assert_equal('post', @post_serializer.class._cache_key)
       assert_equal('writer', @author_serializer.class._cache_key)
-      assert_equal(nil, @comment_serializer.class._cache_key)
+      assert_nil(@comment_serializer.class._cache_key)
     end
 
     def test_cache_key_interpolation_with_updated_at_when_cache_key_is_not_defined_on_object
@@ -171,7 +171,7 @@ def test_error_is_raised_if_cache_key_is_not_defined_on_object_or_passed_as_cach
 
     def test_cache_options_definition
       assert_equal({ expires_in: 0.1, skip_digest: true }, @post_serializer.class._cache_options)
-      assert_equal(nil, @blog_serializer.class._cache_options)
+      assert_nil(@blog_serializer.class._cache_options)
       assert_equal({ expires_in: 1.day, skip_digest: true }, @comment_serializer.class._cache_options)
     end
 
@@ -182,8 +182,8 @@ def test_fragment_cache_definition
 
     def test_associations_separately_cache
       cache_store.clear
-      assert_equal(nil, cache_store.fetch(@post.cache_key))
-      assert_equal(nil, cache_store.fetch(@comment.cache_key))
+      assert_nil(cache_store.fetch(@post.cache_key))
+      assert_nil(cache_store.fetch(@comment.cache_key))
 
       Timecop.freeze(Time.current) do
         render_object_with_cache(@post)

test/serializers/caching_configuration_test_isolated.rb

@@ -69,9 +69,9 @@ class PerformCachingTrue < CachingConfigurationTest
     end
 
     test 'the non-cached serializer cache_store is nil' do
-      assert_equal nil, @non_cached_serializer._cache
-      assert_equal nil, @non_cached_serializer.cache_store
-      assert_equal nil, @non_cached_serializer._cache
+      assert_nil @non_cached_serializer._cache
+      assert_nil @non_cached_serializer.cache_store
+      assert_nil @non_cached_serializer._cache
     end
 
     test 'the non-cached serializer does not have cache_enabled?' do
@@ -136,9 +136,9 @@ class PerformCachingFalse < CachingConfigurationTest
     end
 
     test 'the non-cached serializer cache_store is nil' do
-      assert_equal nil, @non_cached_serializer._cache
-      assert_equal nil, @non_cached_serializer.cache_store
-      assert_equal nil, @non_cached_serializer._cache
+      assert_nil @non_cached_serializer._cache
+      assert_nil @non_cached_serializer.cache_store
+      assert_nil @non_cached_serializer._cache
     end
 
     test 'the non-cached serializer does not have cache_enabled?' do

test/serializers/serializer_for_test.rb

@@ -59,7 +59,7 @@ def setup
 
         def test_serializer_for_non_ams_serializer
           serializer = ActiveModel::Serializer.serializer_for(@tweet)
-          assert_equal nil, serializer
+          assert_nil serializer
         end
 
         def test_serializer_for_existing_serializer
@@ -71,12 +71,12 @@ def test_serializer_for_existing_serializer_with_lookup_disabled
           serializer = with_serializer_lookup_disabled do
             ActiveModel::Serializer.serializer_for(@profile)
           end
-          assert_equal nil, serializer
+          assert_nil serializer
         end
 
         def test_serializer_for_not_existing_serializer
           serializer = ActiveModel::Serializer.serializer_for(@model)
-          assert_equal nil, serializer
+          assert_nil serializer
         end
 
         def test_serializer_inherited_serializer
@@ -88,7 +88,7 @@ def test_serializer_inherited_serializer_with_lookup_disabled
           serializer = with_serializer_lookup_disabled do
             ActiveModel::Serializer.serializer_for(@my_profile)
           end
-          assert_equal nil, serializer
+          assert_nil serializer
         end
 
         def test_serializer_custom_serializer
@@ -114,7 +114,7 @@ def test_serializer_for_namespaced_resource_with_lookup_disabled
           serializer = with_serializer_lookup_disabled do
             ActiveModel::Serializer.serializer_for(post)
           end
-          assert_equal nil, serializer
+          assert_nil serializer
         end
 
         def test_serializer_for_nested_resource
@@ -128,7 +128,7 @@ def test_serializer_for_nested_resource_with_lookup_disabled
           serializer = with_serializer_lookup_disabled do
             ResourceNamespace::PostSerializer.serializer_for(comment)
           end
-          assert_equal nil, serializer
+          assert_nil serializer
         end
       end
     end