Merge pull request #821 from wjordan/patch-1

Fix explicit serializer for associations

Author: kurko

lib/active_model/serializer.rb

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

test/adapter/json_api/has_many_explicit_serializer_test.rb

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