Merge pull request #892 from groyoh/fix-json-nil-association

Fixed a bug that appeared when json adapter serialize a nil association
rails-api · May 5, 2015 · ece43f3 · ece43f3
2 parents 6a06b90 + 5dcdfaa
commit ece43f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/active_model/serializer/adapter/json.rb b/lib/active_model/serializer/adapter/json.rb
@@ -23,7 +23,7 @@ def serializable_hash(options = {})
                   end
                 end
               else
-                if association
+                if association && association.object
                   @hash[name] = cache_check(association) do
                     association.attributes(options)
                   end

diff --git a/test/adapter/json/belongs_to_test.rb b/test/adapter/json/belongs_to_test.rb
@@ -34,6 +34,13 @@ def test_include_nil_author
 
             assert_equal({title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], blog: {id: 999, name: "Custom blog"}, author: nil}, adapter.serializable_hash)
           end
+
+          def test_include_nil_author_with_specified_serializer
+            serializer = PostPreviewSerializer.new(@anonymous_post)
+            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+
+            assert_equal({title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], author: nil}, adapter.serializable_hash)
+          end
         end
       end
     end