diff --git a/lib/active_model/serializer/lint.rb b/lib/active_model/serializer/lint.rb index eba88b1d0..b2bc48ff9 100644 --- a/lib/active_model/serializer/lint.rb +++ b/lib/active_model/serializer/lint.rb @@ -102,7 +102,7 @@ def test_cache_key def test_updated_at assert_respond_to resource, :updated_at actual_arity = resource.method(:updated_at).arity - assert_equal actual_arity, 0, "expected #{actual_arity.inspect} to be 0" + assert_equal 0, actual_arity end # Passes if the object responds to id and if it takes no @@ -113,7 +113,7 @@ def test_updated_at # It is not required unless caching is enabled. def test_id assert_respond_to resource, :id - assert_equal resource.method(:id).arity, 0 + assert_equal 0, resource.method(:id).arity end # Passes if the object's class responds to model_name and if it diff --git a/test/array_serializer_test.rb b/test/array_serializer_test.rb index 53922d22f..350e44473 100644 --- a/test/array_serializer_test.rb +++ b/test/array_serializer_test.rb @@ -28,7 +28,7 @@ def test_json_key_with_root_warns_when_using_array_serializer comment = Comment.new post = Post.new serializer = ArraySerializer.new([comment, post]) - assert_equal serializer.json_key, 'comments' + assert_equal 'comments', serializer.json_key end) assert_match(/Calling deprecated ArraySerializer/, stderr) end diff --git a/test/collection_serializer_test.rb b/test/collection_serializer_test.rb index 8b9991a4a..662aa1ee4 100644 --- a/test/collection_serializer_test.rb +++ b/test/collection_serializer_test.rb @@ -36,7 +36,7 @@ def test_each_object_should_be_serialized_with_appropriate_serializer assert_kind_of PostSerializer, serializers.last assert_kind_of Post, serializers.last.object - assert_equal serializers.last.custom_options[:some], :options + assert_equal :options, serializers.last.custom_options[:some] end def test_serializer_option_not_passed_to_each_serializer @@ -47,50 +47,50 @@ def test_serializer_option_not_passed_to_each_serializer def test_root_default @serializer = collection_serializer.new([@comment, @post]) - assert_equal @serializer.root, nil + assert_nil @serializer.root end def test_root expected = 'custom_root' @serializer = collection_serializer.new([@comment, @post], root: expected) - assert_equal @serializer.root, expected + assert_equal expected, @serializer.root end def test_root_with_no_serializers expected = 'custom_root' @serializer = collection_serializer.new([], root: expected) - assert_equal @serializer.root, expected + assert_equal expected, @serializer.root end def test_json_key - assert_equal @serializer.json_key, 'comments' + assert_equal 'comments', @serializer.json_key end def test_json_key_with_resource_with_name_and_no_serializers serializer = collection_serializer.new(build_named_collection) - assert_equal serializer.json_key, 'me_resources' + assert_equal 'me_resources', serializer.json_key end def test_json_key_with_resource_with_nil_name_and_no_serializers resource = [] resource.define_singleton_method(:name) { nil } serializer = collection_serializer.new(resource) - assert_equal serializer.json_key, nil + assert_nil serializer.json_key end def test_json_key_with_resource_without_name_and_no_serializers serializer = collection_serializer.new([]) - assert_equal serializer.json_key, nil + assert_nil serializer.json_key end def test_json_key_with_root serializer = collection_serializer.new(@resource, root: 'custom_root') - assert_equal serializer.json_key, 'custom_roots' + assert_equal 'custom_roots', serializer.json_key end def test_json_key_with_root_and_no_serializers serializer = collection_serializer.new(build_named_collection, root: 'custom_root') - assert_equal serializer.json_key, 'custom_roots' + assert_equal 'custom_roots', serializer.json_key end end end diff --git a/test/serializers/associations_test.rb b/test/serializers/associations_test.rb index 334c9b414..4778fb2e2 100644 --- a/test/serializers/associations_test.rb +++ b/test/serializers/associations_test.rb @@ -52,8 +52,8 @@ def test_has_many_with_no_serializer serializer = association.serializer options = association.options - assert_equal key, :tags - assert_equal serializer, nil + assert_equal :tags, key + assert_nil serializer assert_equal [{ name: '#hashtagged' }].to_json, options[:virtual_value].to_json end end