Refactoring

Author: wasifhossain

lib/active_model_serializers/adapter/attributes.rb

@@ -16,6 +16,8 @@ def serializable_hash(options = nil)
         self.class.transform_key_casing!(serialized_hash, instance_options)
       end
 
+      private
+
       def fields_to_fieldset(fields)
         return fields if fields.nil?
         resource_fields = []
@@ -27,7 +29,7 @@ def fields_to_fieldset(fields)
           else fail ArgumentError, "Unknown conversion of fields to fieldset: '#{field.inspect}' in '#{fields.inspect}'"
           end
         end
-        relationship_fields.merge(serializer.json_key.to_sym => resource_fields)
+        relationship_fields.merge!(serializer.json_key.to_sym => resource_fields)
       end
     end
   end

test/adapter/json/fields_test.rb

@@ -17,7 +17,7 @@ class Comment < ::Model
         end
 
         class PostSerializer < ActiveModel::Serializer
-          type 'posts'
+          type 'post'
           attributes :title, :body
           belongs_to :author
           has_many :comments
@@ -28,7 +28,7 @@ class AuthorSerializer < ActiveModel::Serializer
         end
 
         class CommentSerializer < ActiveModel::Serializer
-          type 'comments'
+          type 'comment'
           attributes :title, :body
           belongs_to :author
         end
@@ -47,15 +47,15 @@ def test_fields_attributes
           fields = [:title]
           hash = serializable(@post, adapter: :json, fields: fields, include: []).serializable_hash
           expected = { title: 'Title 1' }
-          assert_equal(expected, hash[:posts])
+          assert_equal(expected, hash[:post])
         end
 
         def test_fields_included
           fields = [:title, { comments: [:body] }]
           hash = serializable(@post, adapter: :json, include: [:comments], fields: fields).serializable_hash
           expected = [{ body: @comment1.body }, { body: @comment2.body }]
 
-          assert_equal(expected, hash[:posts][:comments])
+          assert_equal(expected, hash[:post][:comments])
         end
       end
     end