ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-24 14:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #821 from wjordan/patch-1

Browse Source 
Fix explicit serializer for associations
This commit is contained in:
Alexandre de Oliveira 2015-03-01 08:46:27 -05:00
commit 77fb050d24
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/active_model/serializer.rb
View File

@ -176,7 +176,7 @@ module ActiveModel
def serializer_from_options(options) def serializer_from_options(options)
opts = {} opts = {}
serializer = options.fetch(:options, {}).fetch(:serializer, nil) serializer = options.fetch(:association_options, {}).fetch(:serializer, nil)
opts[:serializer] = serializer if serializer opts[:serializer] = serializer if serializer
opts opts
end end

5
test/adapter/json_api/has_many_explicit_serializer_test.rb
View File

@ -34,8 +34,9 @@ module ActiveModel
end end
def test_includes_linked_comments def test_includes_linked_comments
assert_equal([{ id: '1', body: "ZOMG A COMMENT", links: { post: @post.id.to_s, author: nil }}, # If CommentPreviewSerializer is applied correctly the body text will not be present in the output
{ id: '2', body: "ZOMG ANOTHER COMMENT", links: { post: @post.id.to_s, author: nil }}], assert_equal([{ id: '1', links: { post: @post.id.to_s}},
{ id: '2', links: { post: @post.id.to_s}}],
@adapter.serializable_hash[:linked][:comments]) @adapter.serializable_hash[:linked][:comments])
end end