updating tests to match new adapters structure

This commit is contained in:
João Moura
2015-06-15 13:39:36 -03:00
parent 2e46507971
commit 1ea5608e78
17 changed files with 49 additions and 43 deletions

View File

@@ -22,7 +22,8 @@ module ActiveModel
def as_json(options = {})
hash = serializable_hash(options)
include_meta(hash)
include_meta(hash) unless self.class == FlattenJson
hash
end
def self.create(resource, options = {})

View File

@@ -7,8 +7,6 @@ module ActiveModel
attr_reader :meta, :meta_key
def initialize(objects, options = {})
options.merge!(root: nil)
@objects = objects.map do |object|
serializer_class = options.fetch(
:serializer,
@@ -21,7 +19,7 @@ module ActiveModel
end
def json_key
@objects.first.json_key.pluralize if @objects.first
@objects.first.json_key if @objects.first
end
def root=(root)

View File

@@ -12,7 +12,7 @@ module ActiveModel
end
def fields_for(serializer)
key = serializer.json_key || serializer.class.root_name
key = serializer.json_key
fields[key.to_sym]
end