Merge branch 'master' into nested-serializers

Author: beauby

lib/active_model/serializer/adapter/json.rb

@@ -7,7 +7,6 @@ class Json < Base
 
         def serializable_hash(options = nil)
           options ||= {}
-
           { root => Attributes.new(serializer, instance_options).serializable_hash(options) }
         end
 

test/adapter/json/collection_test.rb

@@ -75,6 +75,16 @@ def test_root_is_underscored
 
             assert_equal 1, adapter.serializable_hash[:virtual_values].length
           end
+
+          def test_include_option
+            serializer = ArraySerializer.new([@first_post, @second_post])
+            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, include: '')
+            actual = adapter.serializable_hash
+            expected = { posts: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' },
+                                 { id: 2, title: 'New Post', body: 'Body' }] }
+
+            assert_equal(expected, actual)
+          end
         end
       end
     end