Merge f9b7c74 into 47deb87

rails-api · Oct 22, 2014 · e50fc30 · e50fc30
2 parents 47deb87 + f9b7c74
commit e50fc30
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb
@@ -18,7 +18,7 @@ def serializable_hash(options = {})
 
             serializer.each_association do |name, association, opts|
               @hash[@root][:links] ||= {}
-              unless options[:embed] == :ids
+              unless opts[:embed] == :ids
                 @hash[:linked] ||= {}
               end
 

diff --git a/test/adapter/json_api/has_many_embed_ids.rb → ...apter/json_api/has_many_embed_ids_test.rb b/test/adapter/json_api/has_many_embed_ids.rb → ...apter/json_api/has_many_embed_ids_test.rb