Cleanup PORO fixtures

Author: bf4

test/cache_test.rb

@@ -52,6 +52,11 @@ class InheritedRoleSerializer < RoleSerializer
     class Comment < ::Model
       attributes :body
       associations :post, :author
+
+      # Uses a custom non-time-based cache key
+      def cache_key
+        "comment/#{id}"
+      end
     end
 
     setup do
@@ -329,11 +334,6 @@ def test_cache_digest_definition
     end
 
     def test_object_cache_keys
-      class << @comment
-        def cache_key
-          "comment/#{id}"
-        end
-      end
       serializable = ActiveModelSerializers::SerializableResource.new([@comment, @comment])
       include_directive = JSONAPI::IncludeDirective.new('*', allow_wildcard: true)
 

test/collection_serializer_test.rb

@@ -3,14 +3,27 @@
 module ActiveModel
   class Serializer
     class CollectionSerializerTest < ActiveSupport::TestCase
+      SingularModel = poro_without_caching_support
+      class SingularModelSerializer < ActiveModel::Serializer
+      end
+      HasManyModel = poro_without_caching_support(::Model) do
+        associations :singular_models
+      end
+      class HasManyModelSerializer < ActiveModel::Serializer
+        has_many :singular_models
+
+        def custom_options
+          instance_options
+        end
+      end
       class MessagesSerializer < ActiveModel::Serializer
         type 'messages'
       end
 
       def setup
-        @comment = Comment.new
-        @post = Post.new
-        @resource = build_named_collection @comment, @post
+        @singular_model = SingularModel.new
+        @has_many_model = HasManyModel.new
+        @resource = build_named_collection @singular_model, @has_many_model
         @serializer = collection_serializer.new(@resource, some: :options)
       end
 
@@ -34,29 +47,29 @@ def test_respond_to_each
       def test_each_object_should_be_serialized_with_appropriate_serializer
         serializers =  @serializer.to_a
 
-        assert_kind_of CommentSerializer, serializers.first
-        assert_kind_of Comment, serializers.first.object
+        assert_kind_of SingularModelSerializer, serializers.first
+        assert_kind_of SingularModel, serializers.first.object
 
-        assert_kind_of PostSerializer, serializers.last
-        assert_kind_of Post, serializers.last.object
+        assert_kind_of HasManyModelSerializer, serializers.last
+        assert_kind_of HasManyModel, serializers.last.object
 
         assert_equal :options, serializers.last.custom_options[:some]
       end
 
       def test_serializer_option_not_passed_to_each_serializer
-        serializers = collection_serializer.new([@post], serializer: PostSerializer).to_a
+        serializers = collection_serializer.new([@has_many_model], serializer: HasManyModelSerializer).to_a
 
         refute serializers.first.custom_options.key?(:serializer)
       end
 
       def test_root_default
-        @serializer = collection_serializer.new([@comment, @post])
+        @serializer = collection_serializer.new([@singular_model, @has_many_model])
         assert_nil @serializer.root
       end
 
       def test_root
         expected =  'custom_root'
-        @serializer = collection_serializer.new([@comment, @post], root: expected)
+        @serializer = collection_serializer.new([@singular_model, @has_many_model], root: expected)
         assert_equal expected, @serializer.root
       end
 

test/fixtures/poro.rb

@@ -40,13 +40,6 @@ class Profile < Model
 end
 class ProfileSerializer < ActiveModel::Serializer
   attributes :name, :description
-
-  # ActiveModel::Serializer::OptionsTest#test_options_are_accessible:
-  # test/serializers/options_test.rb:12:in `test_options_are_accessible'
-  # test/serializers/options_test.rb:17:in `test_no_option_is_passed_in'
-  def arguments_passed_in?
-    instance_options[:my_options] == :accessible
-  end
 end
 class ProfilePreviewSerializer < ActiveModel::Serializer
   attributes :name
@@ -73,21 +66,12 @@ class AuthorPreviewSerializer < ActiveModel::Serializer
 class Comment < Model
   attributes :body, :date
   associations :post, :author, :likes
-
-  # Uses a custom non-time-based cache key
-  def cache_key
-    "#{self.class.name.downcase}/#{id}"
-  end
 end
 class CommentSerializer < ActiveModel::Serializer
   cache expires_in: 1.day, skip_digest: true
   attributes :id, :body
   belongs_to :post
   belongs_to :author
-
-  def custom_options
-    instance_options
-  end
 end
 class CommentPreviewSerializer < ActiveModel::Serializer
   attributes :id
@@ -110,18 +94,6 @@ class PostSerializer < ActiveModel::Serializer
   def blog
     Blog.new(id: 999, name: 'Custom blog')
   end
-
-  # ActiveModel::Serializer::ArraySerializerTest#test_each_object_should_be_serialized_with_appropriate_serializer:
-  # test/collection_serializer_test.rb:43:in `test_each_object_should_be_serialized_with_appropriate_serializer'
-  # ActiveModel::Serializer::ArraySerializerTest#test_serializer_option_not_passed_to_each_serializer:
-  # test/collection_serializer_test.rb:49:in `test_serializer_option_not_passed_to_each_serializer'
-  # ActiveModel::Serializer::CollectionSerializerTest#test_each_object_should_be_serialized_with_appropriate_serializer:
-  # test/collection_serializer_test.rb:43:in `test_each_object_should_be_serialized_with_appropriate_serializer'
-  # ActiveModel::Serializer::CollectionSerializerTest#test_serializer_option_not_passed_to_each_serializer:
-  # test/collection_serializer_test.rb:49:in `test_serializer_option_not_passed_to_each_serializer'
-  def custom_options
-    instance_options
-  end
 end
 class SpammyPostSerializer < ActiveModel::Serializer
   attributes :id

test/serializers/associations_test.rb

@@ -62,7 +62,13 @@ def test_serializer_options_are_passed_into_associations_serializers
                       .associations
                       .detect { |assoc| assoc.key == :comments }
 
-        assert association.serializer.first.custom_options[:custom_options]
+        comment_serializer = association.serializer.first
+        class << comment_serializer
+          def custom_options
+            instance_options
+          end
+        end
+        assert comment_serializer.custom_options
       end
 
       def test_belongs_to

test/serializers/options_test.rb

@@ -3,18 +3,29 @@
 module ActiveModel
   class Serializer
     class OptionsTest < ActiveSupport::TestCase
-      def setup
-        @profile = Profile.new(name: 'Name 1', description: 'Description 1')
+      ModelWithOptions = poro_without_caching_support do
+        attributes :name, :description
+      end
+      class ModelWithOptionsSerializer < ActiveModel::Serializer
+        attributes :name, :description
+
+        def arguments_passed_in?
+          instance_options[:my_options] == :accessible
+        end
+      end
+
+      setup do
+        @model_with_options = ModelWithOptions.new(name: 'Name 1', description: 'Description 1')
       end
 
       def test_options_are_accessible
-        @profile_serializer = ProfileSerializer.new(@profile, my_options: :accessible)
-        assert @profile_serializer.arguments_passed_in?
+        model_with_options_serializer = ModelWithOptionsSerializer.new(@model_with_options, my_options: :accessible)
+        assert model_with_options_serializer.arguments_passed_in?
       end
 
       def test_no_option_is_passed_in
-        @profile_serializer = ProfileSerializer.new(@profile)
-        refute @profile_serializer.arguments_passed_in?
+        model_with_options_serializer = ModelWithOptionsSerializer.new(@model_with_options)
+        refute model_with_options_serializer.arguments_passed_in?
       end
     end
   end