Merge branch 'vasilakisfil-feat/fields_from_constructor'

This commit is contained in:
Benjamin Fleischer 2016-06-09 03:27:09 -05:00
commit 848479b460
2 changed files with 15 additions and 0 deletions

View File

@ -3,6 +3,7 @@ module ActiveModelSerializers
class Attributes < Base
def serializable_hash(options = nil)
options = serialization_options(options)
options[:fields] ||= instance_options[:fields]
serializer.serializable_hash(instance_options, options, self)
end
end

View File

@ -84,6 +84,20 @@ module ActiveModelSerializers
assert_equal(expected, actual)
end
def test_fields_with_no_associations_include_option
actual = ActiveModelSerializers::SerializableResource.new(
[@first_post, @second_post], adapter: :json, fields: [:id], include: []
).as_json
expected = { posts: [{
id: 1
}, {
id: 2
}] }
assert_equal(expected, actual)
end
end
end
end