From 1cc2e04cf646ad64e89162d99546dfc026666f86 Mon Sep 17 00:00:00 2001
From: Benjamin Fleischer <github@benjaminfleischer.com>
Date: Mon, 8 Feb 2016 18:14:25 -0600
Subject: [PATCH] Address issues in 50950d95333da #1340

- Add changelog entry
- Remove superseded and incorrect tests
- Fix array serialization test
---
 CHANGELOG.md                                |  1 +
 test/adapter/json_api/resource_meta_test.rb | 11 ++++++++---
 test/serializers/meta_test.rb               | 16 ----------------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4468d782..00af8554 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Breaking changes:
 Features:
 - [#1018](https://github.com/rails-api/active_model_serializers/pull/1018) Add more tests and docs for top-level links (@leandrocp)
+- [#1340](https://github.com/rails-api/active_model_serializers/pull/1340) Add support for resource-level meta (@beauby)
 Fixes:
 - [#1501](https://github.com/rails-api/active_model_serializers/pull/1501) Adds tests for SerializableResource::use_adapter?,doc typos (@domitian)
 - [#1488](https://github.com/rails-api/active_model_serializers/pull/1488) Require ActiveSupport's string inflections (@nate00)
diff --git a/test/adapter/json_api/resource_meta_test.rb b/test/adapter/json_api/resource_meta_test.rb
index 4298f03c..7eec4365 100644
--- a/test/adapter/json_api/resource_meta_test.rb
+++ b/test/adapter/json_api/resource_meta_test.rb
@@ -46,15 +46,20 @@ module ActiveModel
           end
 
           def test_meta_object_resource_in_array
+            post2 = Post.new(id: 1339, comments: [Comment.new])
+            posts = [@post, post2]
             hash = ActiveModel::SerializableResource.new(
-              [@post, @post],
+              posts,
               each_serializer: MetaBlockPostSerializer,
               adapter: :json_api
             ).serializable_hash
             expected = {
-              comments_count: @post.comments.count
+              :data => [
+                { :id => '1337', :type => 'posts', :meta => { :comments_count => 0 } },
+                { :id => '1339', :type => 'posts', :meta => { :comments_count => 1 } }
+              ]
             }
-            assert_equal([expected, expected], hash[:data].map { |obj| obj[:meta] })
+            assert_equal(expected, hash)
           end
         end
       end
diff --git a/test/serializers/meta_test.rb b/test/serializers/meta_test.rb
index e7595476..a555adb7 100644
--- a/test/serializers/meta_test.rb
+++ b/test/serializers/meta_test.rb
@@ -3,8 +3,6 @@ require 'test_helper'
 module ActiveModel
   class Serializer
     class MetaTest < ActiveSupport::TestCase
-      MetaBlogSerializer = Class.new(ActiveModel::Serializer)
-
       def setup
         @blog = Blog.new(id: 1,
                          name: 'AMS Hints',
@@ -127,20 +125,6 @@ module ActiveModel
         }
         assert_equal(expected, actual)
       end
-
-      def test_meta_is_set_with_direct_attributes
-        MetaBlogSerializer.meta stuff: 'value'
-        blog_meta_serializer = MetaBlogSerializer.new(@blog)
-        assert_equal(blog_meta_serializer.meta, stuff: 'value')
-      end
-
-      def test_meta_is_set_with_block
-        MetaBlogSerializer.meta do
-          { articles_count: object.articles.count }
-        end
-        blog_meta_serializer = MetaBlogSerializer.new(@blog)
-        assert_equal(blog_meta_serializer.meta, articles_count: @blog.articles.count)
-      end
     end
   end
 end