From 387d548eb670139cad5c84999b2f558b76cdcea3 Mon Sep 17 00:00:00 2001
From: Lucas Hosseini <lucas.hosseini@gmail.com>
Date: Mon, 5 Oct 2015 06:22:55 +0200
Subject: [PATCH] Fix tests.

---
 CHANGELOG.md                             |  1 +
 test/adapter/json_api/collection_test.rb |  8 +++++---
 test/serializers/attributes_test.rb      |  5 -----
 test/serializers/fieldset_test.rb        | 19 ++++---------------
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43ecc4189..baa15d103 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ Fixes:
 - [#1214](https://github.com/rails-api/active_model_serializers/pull/1214) retrieve the key from the reflection options when building associations (@NullVoxPopuli, @hut8)
 
 Misc:
+- [#1232](https://github.com/rails-api/active_model_serializers/pull/1232) fields option no longer handled at serializer level (@beauby)
 - [#1178](https://github.com/rails-api/active_model_serializers/pull/1178) env CAPTURE_STDERR=false lets devs see hard failures (@bf4)
 - [#1177](https://github.com/rails-api/active_model_serializers/pull/1177) Remove Adapter autoloads in favor of require (@bf4)
 - [#1117](https://github.com/rails-api/active_model_serializers/pull/1117) FlattenJson adapter no longer inherits Json adapter, renamed to Attributes (@bf4)
diff --git a/test/adapter/json_api/collection_test.rb b/test/adapter/json_api/collection_test.rb
index 7f42719e6..d1e70cf87 100644
--- a/test/adapter/json_api/collection_test.rb
+++ b/test/adapter/json_api/collection_test.rb
@@ -58,8 +58,10 @@ def test_include_multiple_posts
           end
 
           def test_limiting_fields
-            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, fields: ['title'])
-
+            actual = ActiveModel::SerializableResource.new(
+              [@first_post, @second_post], adapter: :json_api,
+                                           fields: { posts: ['title'] })
+                     .serializable_hash
             expected = [
               {
                 id: '1',
@@ -86,7 +88,7 @@ def test_limiting_fields
                 }
               }
             ]
-            assert_equal(expected, @adapter.serializable_hash[:data])
+            assert_equal(expected, actual[:data])
           end
         end
       end
diff --git a/test/serializers/attributes_test.rb b/test/serializers/attributes_test.rb
index 735de3f97..684500d99 100644
--- a/test/serializers/attributes_test.rb
+++ b/test/serializers/attributes_test.rb
@@ -18,11 +18,6 @@ def test_attributes_definition
           @profile_serializer.class._attributes)
       end
 
-      def test_attributes_with_fields_option
-        assert_equal({ name: 'Name 1' },
-          @profile_serializer.attributes(fields: [:name]))
-      end
-
       def test_attributes_inheritance_definition
         assert_equal([:id, :body], @serializer_klass._attributes)
       end
diff --git a/test/serializers/fieldset_test.rb b/test/serializers/fieldset_test.rb
index ca613045d..e042f36fe 100644
--- a/test/serializers/fieldset_test.rb
+++ b/test/serializers/fieldset_test.rb
@@ -4,22 +4,11 @@ module ActiveModel
   class Serializer
     class FieldsetTest < Minitest::Test
       def test_fieldset_with_hash
-        fieldset = ActiveModel::Serializer::Fieldset.new({ 'post' => %w(id title), 'coment' => ['body'] })
+        fieldset = ActiveModel::Serializer::Fieldset.new('post' => %w(id title), 'comment' => ['body'])
+        expected = { :post => [:id, :title], :comment => [:body] }
 
-        assert_equal(
-          { :post => [:id, :title], :coment => [:body] },
-          fieldset.fields
-        )
-      end
-
-      def test_fieldset_with_array_of_fields_and_root_name
-        fieldset = ActiveModel::Serializer::Fieldset.new(['title'], 'post')
-
-        assert_equal(
-          { :post => [:title] },
-          fieldset.fields
-        )
+        assert_equal(expected, fieldset.fields)
       end
     end
   end
-end
\ No newline at end of file
+end