From 4a5e1e1ae5d9b996c2d3a02579c98d5d85d23a44 Mon Sep 17 00:00:00 2001
From: twinturbo <me@broadcastingadam.com>
Date: Fri, 15 Mar 2013 08:41:39 +0100
Subject: [PATCH] Attemp to fix bad test

---
 test/caching_test.rb | 60 ++++----------------------------------------
 1 file changed, 5 insertions(+), 55 deletions(-)

diff --git a/test/caching_test.rb b/test/caching_test.rb
index e7ec5816..869f0f93 100644
--- a/test/caching_test.rb
+++ b/test/caching_test.rb
@@ -49,7 +49,7 @@ class CachingTest < ActiveModel::TestCase
     assert serializer.perform_caching
   end
 
-  def test_serializers_cache_serializable_hash
+  def test_serializers_use_cache
     serializer = Class.new(ActiveModel::Serializer) do
       cached true
       attributes :name, :skills
@@ -68,58 +68,8 @@ class CachingTest < ActiveModel::TestCase
 
     instance.to_json
 
-    assert_equal({
-      :name => 'Adam',
-      :skills => ['ruby'],
-    }, serializer.cache.read('serializer/Adam/serializable-hash'))
-  end
-
-  def test_serializers_cache_to_json
-    serializer = Class.new(ActiveModel::Serializer) do
-      cached true
-      attributes :name, :skills
-
-      def self.to_s
-        'serializer'
-      end
-
-      def cache_key
-        object.name
-      end
-    end
-
-    serializer.cache = NullStore.new
-    instance = serializer.new Programmer.new
-
-    instance.to_json
-
-    assert_equal({
-      :name => 'Adam',
-      :skills => ['ruby'],
-    }.to_json, serializer.cache.read('serializer/Adam/to-json'))
-  end
-
-  def test_can_use_defined_cache_key
-    serializer = Class.new(ActiveModel::Serializer) do
-      cached true
-      attributes :name, :skills
-
-      def self.to_s
-        'serializer'
-      end
-
-      def cache_key
-        'custom-key'
-      end
-    end
-
-    serializer.cache = NullStore.new
-    instance = serializer.new Programmer.new
-
-    instance.to_json
-
-    assert serializer.cache.read('serializer/custom-key/to-json')
-    assert serializer.cache.read('serializer/custom-key/serializable-hash')
+    assert_equal(instance.serializable_hash, serializer.cache.read('serializer/Adam/serializable-hash'))
+    assert_equal(instance.to_json, serializer.cache.read('serializer/Adam/to-json'))
   end
 
   def test_array_serializer_uses_cache
@@ -140,7 +90,7 @@ class CachingTest < ActiveModel::TestCase
 
     instance.to_json
 
-    assert serializer.cache.read('array_serializer/cache-key/serializable-array')
-    assert serializer.cache.read('array_serializer/cache-key/to-json')
+    assert_equal instance.serializable_array, serializer.cache.read('array_serializer/cache-key/serializable-array')
+    assert_equal instance.to_json, serializer.cache.read('array_serializer/cache-key/to-json')
   end
 end