Remove remaining fragmented cache class

This commit is contained in:
Benjamin Fleischer
2016-06-07 03:42:03 -05:00
parent 253205bb49
commit b8924157d7
4 changed files with 50 additions and 84 deletions

View File

@@ -14,7 +14,13 @@ module ActiveModelSerializers
end
end
class FragmentedSerializer < ActiveModel::Serializer; end
class FragmentedSerializer < ActiveModel::Serializer
cache only: :id
def id
'special_id'
end
end
setup do
@model = Author.new(id: 1, name: 'Steve K.')
@@ -42,7 +48,6 @@ module ActiveModelSerializers
end
def test_id_defined_on_fragmented
FragmentedSerializer._fragmented = WithDefinedIdSerializer.new(@model)
test_id(FragmentedSerializer, 'special_id')
end

View File

@@ -117,7 +117,7 @@ module ActiveModelSerializers
e = assert_raises ActiveModel::Serializer::UndefinedCacheKey do
render_object_with_cache(article)
end
assert_match(/ActiveModelSerializers::CacheTest::Article must define #cache_key, or the 'key:' option must be passed into 'CachedActiveModelSerializers_CacheTest_ArticleSerializer.cache'/, e.message)
assert_match(/ActiveModelSerializers::CacheTest::Article must define #cache_key, or the 'key:' option must be passed into 'ActiveModelSerializers::CacheTest::ArticleSerializer.cache'/, e.message)
end
def test_cache_options_definition
@@ -438,7 +438,8 @@ module ActiveModelSerializers
@role = Role.new(name: 'Great Author', description: nil)
@role.author = [@author]
@role_serializer = RoleSerializer.new(@role)
@role_hash = @role_serializer.fetch_fragment_cache(ActiveModelSerializers::Adapter.configured_adapter.new(@role_serializer))
adapter_instance = ActiveModelSerializers::Adapter.configured_adapter.new(@role_serializer)
@role_hash = @role_serializer.fetch_attributes_fragment(adapter_instance)
expected_result = {
id: @role.id,
@@ -446,23 +447,19 @@ module ActiveModelSerializers
slug: "#{@role.name}-#{@role.id}",
name: @role.name
}
assert_equal(@role_hash, expected_result)
ensure
fragmented_serializer = @role_serializer
Object.send(:remove_const, fragmented_serializer._get_or_create_fragment_cached_serializer.name)
end
def test_fragment_fetch_with_namespaced_object
@spam = Spam::UnrelatedLink.new(id: 'spam-id-1')
@spam_serializer = Spam::UnrelatedLinkSerializer.new(@spam)
@spam_hash = @spam_serializer.fetch_fragment_cache(ActiveModelSerializers::Adapter.configured_adapter.new(@spam_serializer))
adapter_instance = ActiveModelSerializers::Adapter.configured_adapter.new(@spam_serializer)
@spam_hash = @spam_serializer.fetch_attributes_fragment(adapter_instance)
expected_result = {
id: @spam.id
}
assert_equal(@spam_hash, expected_result)
ensure
fragmented_serializer = @spam_serializer
Object.send(:remove_const, fragmented_serializer._get_or_create_fragment_cached_serializer.name)
end
private