From a263f377978fc07515b42808ebc1f7894fafaa3a Mon Sep 17 00:00:00 2001
From: Brian Durand <brian@embellishedvisions.com>
Date: Fri, 29 Jul 2011 17:27:45 -0500
Subject: Change ActiveSupport::Cache behavior to always return duplicate
 objects instead of frozen objects.

---
 activesupport/test/caching_test.rb | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 402c6695aa..dff3d6ef0d 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -204,7 +204,7 @@ module CacheStoreBehavior
     @cache.write('foo', 'bar', :compress => true)
     raw_value = @cache.send(:read_entry, 'foo', {}).raw_value
     assert_equal 'bar', @cache.read('foo')
-    assert_equal 'bar', raw_value
+    assert_equal 'bar', Marshal.load(raw_value)
   end
 
   def test_read_and_write_compressed_large_data
@@ -270,10 +270,12 @@ module CacheStoreBehavior
     assert !@cache.exist?('foo')
   end
 
-  def test_store_objects_should_be_immutable
+  def test_read_should_return_a_different_object_id_each_time_it_is_called
     @cache.write('foo', 'bar')
-    assert_raise(ActiveSupport::FrozenObjectError) { @cache.read('foo').gsub!(/.*/, 'baz') }
-    assert_equal 'bar', @cache.read('foo')
+    assert_not_equal @cache.read('foo').object_id, @cache.read('foo').object_id
+    value = @cache.read('foo')
+    value << 'bingo'
+    assert_not_equal value, @cache.read('foo')
   end
 
   def test_original_store_objects_should_not_be_immutable
@@ -551,7 +553,8 @@ end
 
 class MemoryStoreTest < ActiveSupport::TestCase
   def setup
-    @cache = ActiveSupport::Cache.lookup_store(:memory_store, :expires_in => 60, :size => 100)
+    @record_size = Marshal.dump("aaaaaaaaaa").bytesize
+    @cache = ActiveSupport::Cache.lookup_store(:memory_store, :expires_in => 60, :size => @record_size * 10)
   end
 
   include CacheStoreBehavior
@@ -566,7 +569,7 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.write(5, "eeeeeeeeee") && sleep(0.001)
     @cache.read(2) && sleep(0.001)
     @cache.read(4)
-    @cache.prune(30)
+    @cache.prune(@record_size * 3)
     assert_equal true, @cache.exist?(5)
     assert_equal true, @cache.exist?(4)
     assert_equal false, @cache.exist?(3)
@@ -719,7 +722,7 @@ class CacheEntryTest < ActiveSupport::TestCase
   def test_non_compress_values
     entry = ActiveSupport::Cache::Entry.new("value")
     assert_equal "value", entry.value
-    assert_equal "value", entry.raw_value
+    assert_equal "value", Marshal.load(entry.raw_value)
     assert_equal false, entry.compressed?
   end
 end
-- 
cgit v1.2.3


From fec4c5ad76a4955364e091296b68bb7ac12bc928 Mon Sep 17 00:00:00 2001
From: Brian Durand <brian@embellishedvisions.com>
Date: Mon, 1 Aug 2011 12:05:29 -0500
Subject: Pass options in ActiveSupport::Cache::CacheStore#read_multi through
 to the delete_entry call.

---
 activesupport/test/caching_test.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 402c6695aa..5e6a2102e0 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -199,6 +199,14 @@ module CacheStoreBehavior
     @cache.write('fud', 'biz')
     assert_equal({"foo" => "bar", "fu" => "baz"}, @cache.read_multi('foo', 'fu'))
   end
+  
+  def test_read_multi_with_expires
+    @cache.write('foo', 'bar', :expires_in => 0.001)
+    @cache.write('fu', 'baz')
+    @cache.write('fud', 'biz')
+    sleep(0.002)
+    assert_equal({"fu" => "baz"}, @cache.read_multi('foo', 'fu'))
+  end
 
   def test_read_and_write_compressed_small_data
     @cache.write('foo', 'bar', :compress => true)
-- 
cgit v1.2.3


From 8d63678d1406c5518d437709af0fde717c0248d7 Mon Sep 17 00:00:00 2001
From: Philippe Huibonhoa <phuibonhoa@gmail.com>
Date: Wed, 21 Sep 2011 21:00:46 -0700
Subject: Fixed issue in file store where it could create a filename that was
 too long for the file system.  (https://github.com/rails/rails/issues/3072)

---
 activesupport/test/caching_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 6bb13ec9b8..6b113594cc 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -557,6 +557,15 @@ class FileStoreTest < ActiveSupport::TestCase
     key = @cache_with_pathname.send(:key_file_path, "views/index?id=1")
     assert_equal "views/index?id=1", @cache_with_pathname.send(:file_path_key, key)
   end
+  
+  # Because file systems have a maximum filename size, filenames > max size should be split in to directories
+  # If filename is 'AAAAB', where max size is 4, the returned path should be AAAA/B
+  def test_key_transformation_max_filename_size
+    key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}B"
+    path = @cache.send(:key_file_path, key)    
+    assert path.split('/').all? { |dir_name| dir_name.size <= ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}
+    assert_equal 'B', File.basename(path)
+  end
 end
 
 class MemoryStoreTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From a0352a425f4995f7f1e1035290fe59c93ac0d24f Mon Sep 17 00:00:00 2001
From: Philippe Huibonhoa <phuibonhoa@gmail.com>
Date: Wed, 21 Sep 2011 21:03:59 -0700
Subject: =?UTF-8?q?Updated=20existing=20test=20that=20fails=20with=20this?=
 =?UTF-8?q?=20fix=20(8d63678d1406c5518d437709af0fde717c0248d7).=20=20Befor?=
 =?UTF-8?q?e=20the=20fix=20the=20test=20was=20giving=20a=20false=20positiv?=
 =?UTF-8?q?e,=20because=20file=5Fstore.key=5Ffile=5Fpath=20would=20return?=
 =?UTF-8?q?=20an=20empty=20filename=20(i.e.=20test/tmp=5Fcache/4D0/F4D=20r?=
 =?UTF-8?q?ather=20than=20test/tmp=5Fcache/4D0/F4D/xxxx=E2=80=A6).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Even though the fix referenced above divides the filename into directories to prevent it from being too long, it seems that 1000 characters will always raise an error, so reducing the key size to 900).
---
 activesupport/test/caching_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 6b113594cc..b692a41312 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -357,7 +357,7 @@ module CacheStoreBehavior
 
   def test_really_long_keys
     key = ""
-    1000.times{key << "x"}
+    900.times{key << "x"}
     assert_equal true, @cache.write(key, "bar")
     assert_equal "bar", @cache.read(key)
     assert_equal "bar", @cache.fetch(key)
-- 
cgit v1.2.3


From 0baa8f8604e7766ce627120dfe572e09c247ef8c Mon Sep 17 00:00:00 2001
From: Philippe Huibonhoa <phuibonhoa@gmail.com>
Date: Thu, 29 Sep 2011 18:59:40 -0700
Subject: Added fix so that file store does not raise an exception when cache
 dir does not exist yet. This can happen if a delete_matched is called before
 anything is saved in the cache.

---
 activesupport/test/caching_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index b692a41312..793e62a74a 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -566,6 +566,13 @@ class FileStoreTest < ActiveSupport::TestCase
     assert path.split('/').all? { |dir_name| dir_name.size <= ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}
     assert_equal 'B', File.basename(path)
   end
+
+  def test_search_dir_when_directory_does_not_exist
+    ActiveSupport::Cache::FileStore.new('test').send(:search_dir, 'dir_does_not_exist') do |path|
+      flunk "search_dir yielded but should have done nothing"
+    end
+    assert true
+  end
 end
 
 class MemoryStoreTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From 119a484e808898a7ff55a27326ad49d8d493eb59 Mon Sep 17 00:00:00 2001
From: Philippe Huibonhoa <phuibonhoa@gmail.com>
Date: Sun, 2 Oct 2011 01:39:52 -0700
Subject: Improved testing so that it tests the real functionality and not the
 private method.

---
 activesupport/test/caching_test.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 793e62a74a..cb5362525f 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -567,11 +567,12 @@ class FileStoreTest < ActiveSupport::TestCase
     assert_equal 'B', File.basename(path)
   end
 
-  def test_search_dir_when_directory_does_not_exist
-    ActiveSupport::Cache::FileStore.new('test').send(:search_dir, 'dir_does_not_exist') do |path|
-      flunk "search_dir yielded but should have done nothing"
+  # If nothing has been stored in the cache, there is a chance the cache directory does not yet exist
+  # Ensure delete_matched gracefully handles this case
+  def test_delete_matched_when_cache_directory_does_not_exist
+    assert_nothing_raised(Exception) do
+      ActiveSupport::Cache::FileStore.new('/test/cache/directory').delete_matched(/does_not_exist/)
     end
-    assert true
   end
 end
 
-- 
cgit v1.2.3


From f3554777b2433d9de6b17c277fde071592d6a10d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:01:53 -0800
Subject: cache entry: options[:compressed] is a regular flag, no need for !!

---
 activesupport/test/caching_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index cb5362525f..29bc4d8ec6 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -723,7 +723,7 @@ class CacheEntryTest < ActiveSupport::TestCase
     entry = ActiveSupport::Cache::Entry.create("raw", time, :compress => false, :expires_in => 300)
     assert_equal "raw", entry.raw_value
     assert_equal time.to_f, entry.created_at
-    assert_equal false, entry.compressed?
+    assert !entry.compressed?
     assert_equal 300, entry.expires_in
   end
 
@@ -740,7 +740,7 @@ class CacheEntryTest < ActiveSupport::TestCase
   def test_compress_values
     entry = ActiveSupport::Cache::Entry.new("value", :compress => true, :compress_threshold => 1)
     assert_equal "value", entry.value
-    assert_equal true, entry.compressed?
+    assert entry.compressed?
     assert_equal "value", Marshal.load(Zlib::Inflate.inflate(entry.raw_value))
   end
 
@@ -748,6 +748,6 @@ class CacheEntryTest < ActiveSupport::TestCase
     entry = ActiveSupport::Cache::Entry.new("value")
     assert_equal "value", entry.value
     assert_equal "value", Marshal.load(entry.raw_value)
-    assert_equal false, entry.compressed?
+    assert !entry.compressed?
   end
 end
-- 
cgit v1.2.3


From a539a5e3f3be68f027d3dfe43f88dc9f0642c743 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:11:19 -0800
Subject: tests predicates according to the boolean interpretation of their
 return value, not expecting specifically true or false

---
 activesupport/test/caching_test.rb | 98 +++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 29bc4d8ec6..7d56b2a372 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -122,8 +122,8 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/^fo/)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 
   def test_delete_matched_key
@@ -131,15 +131,15 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/OO/i)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 end
 
 # Tests the base functionality that should be identical across all cache stores.
 module CacheStoreBehavior
   def test_should_read_and_write_strings
-    assert_equal true, @cache.write('foo', 'bar')
+    assert @cache.write('foo', 'bar')
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -174,23 +174,23 @@ module CacheStoreBehavior
   end
 
   def test_should_read_and_write_hash
-    assert_equal true, @cache.write('foo', {:a => "b"})
+    assert @cache.write('foo', {:a => "b"})
     assert_equal({:a => "b"}, @cache.read('foo'))
   end
 
   def test_should_read_and_write_integer
-    assert_equal true, @cache.write('foo', 1)
+    assert @cache.write('foo', 1)
     assert_equal 1, @cache.read('foo')
   end
 
   def test_should_read_and_write_nil
-    assert_equal true, @cache.write('foo', nil)
+    assert @cache.write('foo', nil)
     assert_equal nil, @cache.read('foo')
   end
 
   def test_should_read_and_write_false
-    assert_equal true, @cache.write('foo', false)
-    assert_equal false, @cache.read('foo')
+    assert @cache.write('foo', false)
+    assert !@cache.read('foo')
   end
 
   def test_read_multi
@@ -262,19 +262,19 @@ module CacheStoreBehavior
 
   def test_exist
     @cache.write('foo', 'bar')
-    assert_equal true, @cache.exist?('foo')
-    assert_equal false, @cache.exist?('bar')
+    assert @cache.exist?('foo')
+    assert !@cache.exist?('bar')
   end
 
   def test_nil_exist
     @cache.write('foo', nil)
-    assert_equal true, @cache.exist?('foo')
+    assert @cache.exist?('foo')
   end
 
   def test_delete
     @cache.write('foo', 'bar')
     assert @cache.exist?('foo')
-    assert_equal true, @cache.delete('foo')
+    assert @cache.delete('foo')
     assert !@cache.exist?('foo')
   end
 
@@ -346,10 +346,10 @@ module CacheStoreBehavior
 
   def test_crazy_key_characters
     crazy_key = "#/:*(<+=> )&$%@?;'\"\'`~-"
-    assert_equal true, @cache.write(crazy_key, "1", :raw => true)
+    assert @cache.write(crazy_key, "1", :raw => true)
     assert_equal "1", @cache.read(crazy_key)
     assert_equal "1", @cache.fetch(crazy_key)
-    assert_equal true, @cache.delete(crazy_key)
+    assert @cache.delete(crazy_key)
     assert_equal "2", @cache.fetch(crazy_key, :raw => true) { "2" }
     assert_equal 3, @cache.increment(crazy_key)
     assert_equal 2, @cache.decrement(crazy_key)
@@ -358,12 +358,12 @@ module CacheStoreBehavior
   def test_really_long_keys
     key = ""
     900.times{key << "x"}
-    assert_equal true, @cache.write(key, "bar")
+    assert @cache.write(key, "bar")
     assert_equal "bar", @cache.read(key)
     assert_equal "bar", @cache.fetch(key)
     assert_nil @cache.read("#{key}x")
     assert_equal({key => "bar"}, @cache.read_multi(key))
-    assert_equal true, @cache.delete(key)
+    assert @cache.delete(key)
   end
 end
 
@@ -375,10 +375,10 @@ module EncodedKeyCacheBehavior
     Encoding.list.each do |encoding|
       define_method "test_#{encoding.name.underscore}_encoded_values" do
         key = "foo".force_encoding(encoding)
-        assert_equal true, @cache.write(key, "1", :raw => true)
+        assert @cache.write(key, "1", :raw => true)
         assert_equal "1", @cache.read(key)
         assert_equal "1", @cache.fetch(key)
-        assert_equal true, @cache.delete(key)
+        assert @cache.delete(key)
         assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
         assert_equal 3, @cache.increment(key)
         assert_equal 2, @cache.decrement(key)
@@ -387,10 +387,10 @@ module EncodedKeyCacheBehavior
 
     def test_common_utf8_values
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
+      assert @cache.write(key, "1", :raw => true)
       assert_equal "1", @cache.read(key)
       assert_equal "1", @cache.fetch(key)
-      assert_equal true, @cache.delete(key)
+      assert @cache.delete(key)
       assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
       assert_equal 3, @cache.increment(key)
       assert_equal 2, @cache.decrement(key)
@@ -398,7 +398,7 @@ module EncodedKeyCacheBehavior
 
     def test_retains_encoding
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
+      assert @cache.write(key, "1", :raw => true)
       assert_equal Encoding::UTF_8, key.encoding
     end
   end
@@ -411,10 +411,10 @@ module CacheDeleteMatchedBehavior
     @cache.write("foo/bar", "baz")
     @cache.write("fu/baz", "bar")
     @cache.delete_matched(/oo/)
-    assert_equal false, @cache.exist?("foo")
-    assert_equal true, @cache.exist?("fu")
-    assert_equal false, @cache.exist?("foo/bar")
-    assert_equal true, @cache.exist?("fu/baz")
+    assert !@cache.exist?("foo")
+    assert @cache.exist?("fu")
+    assert !@cache.exist?("foo/bar")
+    assert @cache.exist?("fu/baz")
   end
 end
 
@@ -443,7 +443,7 @@ module LocalCacheBehavior
     retval = @cache.with_local_cache do
       @cache.write('foo', 'bar')
     end
-    assert_equal true, retval
+    assert retval
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -595,11 +595,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4)
     @cache.prune(@record_size * 3)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_prune_size_on_write
@@ -616,17 +616,17 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4) && sleep(0.001)
     @cache.write(11, "llllllllll")
-    assert_equal true, @cache.exist?(11)
-    assert_equal true, @cache.exist?(10)
-    assert_equal true, @cache.exist?(9)
-    assert_equal true, @cache.exist?(8)
-    assert_equal true, @cache.exist?(7)
-    assert_equal false, @cache.exist?(6)
-    assert_equal false, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(11)
+    assert @cache.exist?(10)
+    assert @cache.exist?(9)
+    assert @cache.exist?(8)
+    assert @cache.exist?(7)
+    assert !@cache.exist?(6)
+    assert !@cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_pruning_is_capped_at_a_max_time
@@ -640,11 +640,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.write(4, "dddddddddd") && sleep(0.001)
     @cache.write(5, "eeeeeeeeee") && sleep(0.001)
     @cache.prune(30, 0.001)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal true, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert @cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 end
 
-- 
cgit v1.2.3


From f312e2142b59b39637ab3d668876c3babac22087 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:14:11 -0800
Subject: Revert "tests predicates according to the boolean interpretation of
 their return value, not expecting specifically true or false"

Reason: there were some genuine tests for false when
reading values, going to revise those ones.

This reverts commit a539a5e3f3be68f027d3dfe43f88dc9f0642c743.
---
 activesupport/test/caching_test.rb | 98 +++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 7d56b2a372..29bc4d8ec6 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -122,8 +122,8 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/^fo/)
-    assert !cache.exist?("foo")
-    assert cache.exist?("fu")
+    assert_equal false, cache.exist?("foo")
+    assert_equal true, cache.exist?("fu")
   end
 
   def test_delete_matched_key
@@ -131,15 +131,15 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/OO/i)
-    assert !cache.exist?("foo")
-    assert cache.exist?("fu")
+    assert_equal false, cache.exist?("foo")
+    assert_equal true, cache.exist?("fu")
   end
 end
 
 # Tests the base functionality that should be identical across all cache stores.
 module CacheStoreBehavior
   def test_should_read_and_write_strings
-    assert @cache.write('foo', 'bar')
+    assert_equal true, @cache.write('foo', 'bar')
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -174,23 +174,23 @@ module CacheStoreBehavior
   end
 
   def test_should_read_and_write_hash
-    assert @cache.write('foo', {:a => "b"})
+    assert_equal true, @cache.write('foo', {:a => "b"})
     assert_equal({:a => "b"}, @cache.read('foo'))
   end
 
   def test_should_read_and_write_integer
-    assert @cache.write('foo', 1)
+    assert_equal true, @cache.write('foo', 1)
     assert_equal 1, @cache.read('foo')
   end
 
   def test_should_read_and_write_nil
-    assert @cache.write('foo', nil)
+    assert_equal true, @cache.write('foo', nil)
     assert_equal nil, @cache.read('foo')
   end
 
   def test_should_read_and_write_false
-    assert @cache.write('foo', false)
-    assert !@cache.read('foo')
+    assert_equal true, @cache.write('foo', false)
+    assert_equal false, @cache.read('foo')
   end
 
   def test_read_multi
@@ -262,19 +262,19 @@ module CacheStoreBehavior
 
   def test_exist
     @cache.write('foo', 'bar')
-    assert @cache.exist?('foo')
-    assert !@cache.exist?('bar')
+    assert_equal true, @cache.exist?('foo')
+    assert_equal false, @cache.exist?('bar')
   end
 
   def test_nil_exist
     @cache.write('foo', nil)
-    assert @cache.exist?('foo')
+    assert_equal true, @cache.exist?('foo')
   end
 
   def test_delete
     @cache.write('foo', 'bar')
     assert @cache.exist?('foo')
-    assert @cache.delete('foo')
+    assert_equal true, @cache.delete('foo')
     assert !@cache.exist?('foo')
   end
 
@@ -346,10 +346,10 @@ module CacheStoreBehavior
 
   def test_crazy_key_characters
     crazy_key = "#/:*(<+=> )&$%@?;'\"\'`~-"
-    assert @cache.write(crazy_key, "1", :raw => true)
+    assert_equal true, @cache.write(crazy_key, "1", :raw => true)
     assert_equal "1", @cache.read(crazy_key)
     assert_equal "1", @cache.fetch(crazy_key)
-    assert @cache.delete(crazy_key)
+    assert_equal true, @cache.delete(crazy_key)
     assert_equal "2", @cache.fetch(crazy_key, :raw => true) { "2" }
     assert_equal 3, @cache.increment(crazy_key)
     assert_equal 2, @cache.decrement(crazy_key)
@@ -358,12 +358,12 @@ module CacheStoreBehavior
   def test_really_long_keys
     key = ""
     900.times{key << "x"}
-    assert @cache.write(key, "bar")
+    assert_equal true, @cache.write(key, "bar")
     assert_equal "bar", @cache.read(key)
     assert_equal "bar", @cache.fetch(key)
     assert_nil @cache.read("#{key}x")
     assert_equal({key => "bar"}, @cache.read_multi(key))
-    assert @cache.delete(key)
+    assert_equal true, @cache.delete(key)
   end
 end
 
@@ -375,10 +375,10 @@ module EncodedKeyCacheBehavior
     Encoding.list.each do |encoding|
       define_method "test_#{encoding.name.underscore}_encoded_values" do
         key = "foo".force_encoding(encoding)
-        assert @cache.write(key, "1", :raw => true)
+        assert_equal true, @cache.write(key, "1", :raw => true)
         assert_equal "1", @cache.read(key)
         assert_equal "1", @cache.fetch(key)
-        assert @cache.delete(key)
+        assert_equal true, @cache.delete(key)
         assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
         assert_equal 3, @cache.increment(key)
         assert_equal 2, @cache.decrement(key)
@@ -387,10 +387,10 @@ module EncodedKeyCacheBehavior
 
     def test_common_utf8_values
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert @cache.write(key, "1", :raw => true)
+      assert_equal true, @cache.write(key, "1", :raw => true)
       assert_equal "1", @cache.read(key)
       assert_equal "1", @cache.fetch(key)
-      assert @cache.delete(key)
+      assert_equal true, @cache.delete(key)
       assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
       assert_equal 3, @cache.increment(key)
       assert_equal 2, @cache.decrement(key)
@@ -398,7 +398,7 @@ module EncodedKeyCacheBehavior
 
     def test_retains_encoding
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert @cache.write(key, "1", :raw => true)
+      assert_equal true, @cache.write(key, "1", :raw => true)
       assert_equal Encoding::UTF_8, key.encoding
     end
   end
@@ -411,10 +411,10 @@ module CacheDeleteMatchedBehavior
     @cache.write("foo/bar", "baz")
     @cache.write("fu/baz", "bar")
     @cache.delete_matched(/oo/)
-    assert !@cache.exist?("foo")
-    assert @cache.exist?("fu")
-    assert !@cache.exist?("foo/bar")
-    assert @cache.exist?("fu/baz")
+    assert_equal false, @cache.exist?("foo")
+    assert_equal true, @cache.exist?("fu")
+    assert_equal false, @cache.exist?("foo/bar")
+    assert_equal true, @cache.exist?("fu/baz")
   end
 end
 
@@ -443,7 +443,7 @@ module LocalCacheBehavior
     retval = @cache.with_local_cache do
       @cache.write('foo', 'bar')
     end
-    assert retval
+    assert_equal true, retval
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -595,11 +595,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4)
     @cache.prune(@record_size * 3)
-    assert @cache.exist?(5)
-    assert @cache.exist?(4)
-    assert !@cache.exist?(3)
-    assert @cache.exist?(2)
-    assert !@cache.exist?(1)
+    assert_equal true, @cache.exist?(5)
+    assert_equal true, @cache.exist?(4)
+    assert_equal false, @cache.exist?(3)
+    assert_equal true, @cache.exist?(2)
+    assert_equal false, @cache.exist?(1)
   end
 
   def test_prune_size_on_write
@@ -616,17 +616,17 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4) && sleep(0.001)
     @cache.write(11, "llllllllll")
-    assert @cache.exist?(11)
-    assert @cache.exist?(10)
-    assert @cache.exist?(9)
-    assert @cache.exist?(8)
-    assert @cache.exist?(7)
-    assert !@cache.exist?(6)
-    assert !@cache.exist?(5)
-    assert @cache.exist?(4)
-    assert !@cache.exist?(3)
-    assert @cache.exist?(2)
-    assert !@cache.exist?(1)
+    assert_equal true, @cache.exist?(11)
+    assert_equal true, @cache.exist?(10)
+    assert_equal true, @cache.exist?(9)
+    assert_equal true, @cache.exist?(8)
+    assert_equal true, @cache.exist?(7)
+    assert_equal false, @cache.exist?(6)
+    assert_equal false, @cache.exist?(5)
+    assert_equal true, @cache.exist?(4)
+    assert_equal false, @cache.exist?(3)
+    assert_equal true, @cache.exist?(2)
+    assert_equal false, @cache.exist?(1)
   end
 
   def test_pruning_is_capped_at_a_max_time
@@ -640,11 +640,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.write(4, "dddddddddd") && sleep(0.001)
     @cache.write(5, "eeeeeeeeee") && sleep(0.001)
     @cache.prune(30, 0.001)
-    assert @cache.exist?(5)
-    assert @cache.exist?(4)
-    assert @cache.exist?(3)
-    assert @cache.exist?(2)
-    assert !@cache.exist?(1)
+    assert_equal true, @cache.exist?(5)
+    assert_equal true, @cache.exist?(4)
+    assert_equal true, @cache.exist?(3)
+    assert_equal true, @cache.exist?(2)
+    assert_equal false, @cache.exist?(1)
   end
 end
 
-- 
cgit v1.2.3


From 8f57bf207ff4f28fa8da4544ebc573007b65439d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:22:02 -0800
Subject: tests predicates according to the boolean interpretation of their
 return value, not expecting specifically true or false

Respecting Genuine assert_equal false Edition
---
 activesupport/test/caching_test.rb | 96 +++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 29bc4d8ec6..b1b6de0613 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -122,8 +122,8 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/^fo/)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 
   def test_delete_matched_key
@@ -131,15 +131,15 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/OO/i)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 end
 
 # Tests the base functionality that should be identical across all cache stores.
 module CacheStoreBehavior
   def test_should_read_and_write_strings
-    assert_equal true, @cache.write('foo', 'bar')
+    assert @cache.write('foo', 'bar')
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -174,22 +174,22 @@ module CacheStoreBehavior
   end
 
   def test_should_read_and_write_hash
-    assert_equal true, @cache.write('foo', {:a => "b"})
+    assert @cache.write('foo', {:a => "b"})
     assert_equal({:a => "b"}, @cache.read('foo'))
   end
 
   def test_should_read_and_write_integer
-    assert_equal true, @cache.write('foo', 1)
+    assert @cache.write('foo', 1)
     assert_equal 1, @cache.read('foo')
   end
 
   def test_should_read_and_write_nil
-    assert_equal true, @cache.write('foo', nil)
+    assert @cache.write('foo', nil)
     assert_equal nil, @cache.read('foo')
   end
 
   def test_should_read_and_write_false
-    assert_equal true, @cache.write('foo', false)
+    assert @cache.write('foo', false)
     assert_equal false, @cache.read('foo')
   end
 
@@ -262,19 +262,19 @@ module CacheStoreBehavior
 
   def test_exist
     @cache.write('foo', 'bar')
-    assert_equal true, @cache.exist?('foo')
-    assert_equal false, @cache.exist?('bar')
+    assert @cache.exist?('foo')
+    assert !@cache.exist?('bar')
   end
 
   def test_nil_exist
     @cache.write('foo', nil)
-    assert_equal true, @cache.exist?('foo')
+    assert @cache.exist?('foo')
   end
 
   def test_delete
     @cache.write('foo', 'bar')
     assert @cache.exist?('foo')
-    assert_equal true, @cache.delete('foo')
+    assert @cache.delete('foo')
     assert !@cache.exist?('foo')
   end
 
@@ -346,10 +346,10 @@ module CacheStoreBehavior
 
   def test_crazy_key_characters
     crazy_key = "#/:*(<+=> )&$%@?;'\"\'`~-"
-    assert_equal true, @cache.write(crazy_key, "1", :raw => true)
+    assert @cache.write(crazy_key, "1", :raw => true)
     assert_equal "1", @cache.read(crazy_key)
     assert_equal "1", @cache.fetch(crazy_key)
-    assert_equal true, @cache.delete(crazy_key)
+    assert @cache.delete(crazy_key)
     assert_equal "2", @cache.fetch(crazy_key, :raw => true) { "2" }
     assert_equal 3, @cache.increment(crazy_key)
     assert_equal 2, @cache.decrement(crazy_key)
@@ -358,12 +358,12 @@ module CacheStoreBehavior
   def test_really_long_keys
     key = ""
     900.times{key << "x"}
-    assert_equal true, @cache.write(key, "bar")
+    assert @cache.write(key, "bar")
     assert_equal "bar", @cache.read(key)
     assert_equal "bar", @cache.fetch(key)
     assert_nil @cache.read("#{key}x")
     assert_equal({key => "bar"}, @cache.read_multi(key))
-    assert_equal true, @cache.delete(key)
+    assert @cache.delete(key)
   end
 end
 
@@ -375,10 +375,10 @@ module EncodedKeyCacheBehavior
     Encoding.list.each do |encoding|
       define_method "test_#{encoding.name.underscore}_encoded_values" do
         key = "foo".force_encoding(encoding)
-        assert_equal true, @cache.write(key, "1", :raw => true)
+        assert @cache.write(key, "1", :raw => true)
         assert_equal "1", @cache.read(key)
         assert_equal "1", @cache.fetch(key)
-        assert_equal true, @cache.delete(key)
+        assert @cache.delete(key)
         assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
         assert_equal 3, @cache.increment(key)
         assert_equal 2, @cache.decrement(key)
@@ -387,10 +387,10 @@ module EncodedKeyCacheBehavior
 
     def test_common_utf8_values
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
+      assert @cache.write(key, "1", :raw => true)
       assert_equal "1", @cache.read(key)
       assert_equal "1", @cache.fetch(key)
-      assert_equal true, @cache.delete(key)
+      assert @cache.delete(key)
       assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
       assert_equal 3, @cache.increment(key)
       assert_equal 2, @cache.decrement(key)
@@ -398,7 +398,7 @@ module EncodedKeyCacheBehavior
 
     def test_retains_encoding
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
+      assert @cache.write(key, "1", :raw => true)
       assert_equal Encoding::UTF_8, key.encoding
     end
   end
@@ -411,10 +411,10 @@ module CacheDeleteMatchedBehavior
     @cache.write("foo/bar", "baz")
     @cache.write("fu/baz", "bar")
     @cache.delete_matched(/oo/)
-    assert_equal false, @cache.exist?("foo")
-    assert_equal true, @cache.exist?("fu")
-    assert_equal false, @cache.exist?("foo/bar")
-    assert_equal true, @cache.exist?("fu/baz")
+    assert !@cache.exist?("foo")
+    assert @cache.exist?("fu")
+    assert !@cache.exist?("foo/bar")
+    assert @cache.exist?("fu/baz")
   end
 end
 
@@ -443,7 +443,7 @@ module LocalCacheBehavior
     retval = @cache.with_local_cache do
       @cache.write('foo', 'bar')
     end
-    assert_equal true, retval
+    assert retval
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -595,11 +595,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4)
     @cache.prune(@record_size * 3)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_prune_size_on_write
@@ -616,17 +616,17 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4) && sleep(0.001)
     @cache.write(11, "llllllllll")
-    assert_equal true, @cache.exist?(11)
-    assert_equal true, @cache.exist?(10)
-    assert_equal true, @cache.exist?(9)
-    assert_equal true, @cache.exist?(8)
-    assert_equal true, @cache.exist?(7)
-    assert_equal false, @cache.exist?(6)
-    assert_equal false, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(11)
+    assert @cache.exist?(10)
+    assert @cache.exist?(9)
+    assert @cache.exist?(8)
+    assert @cache.exist?(7)
+    assert !@cache.exist?(6)
+    assert !@cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_pruning_is_capped_at_a_max_time
@@ -640,11 +640,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.write(4, "dddddddddd") && sleep(0.001)
     @cache.write(5, "eeeeeeeeee") && sleep(0.001)
     @cache.prune(30, 0.001)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal true, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert @cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 end
 
-- 
cgit v1.2.3


From d8e6dc9cf12096908a7a53dec07a397ba23b1088 Mon Sep 17 00:00:00 2001
From: Olek Janiszewski <olek.janiszewski@gmail.com>
Date: Wed, 23 Nov 2011 18:06:15 +0100
Subject: Fix #3737 AS::expand_cache_key generates wrong key in certain
 situations

`cache_key` method is never called when the argument is a 1-element array
with something that responds to `cache_key`
---
 activesupport/test/caching_test.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index b1b6de0613..5c844b8122 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -12,10 +12,10 @@ class CacheKeyTest < ActiveSupport::TestCase
     begin
       ENV['RAILS_CACHE_ID'] = 'c99'
       assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
-      assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
+      assert_equal 'c99/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
       assert_equal 'c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
       assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key(:foo, :nm)
-      assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
+      assert_equal 'nm/c99/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
       assert_equal 'nm/c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
     ensure
       ENV['RAILS_CACHE_ID'] = nil
@@ -50,6 +50,14 @@ class CacheKeyTest < ActiveSupport::TestCase
     assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key(key)
   end
 
+  def test_array_with_something_that_responds_to_cache_key
+    key = 'foo'
+    def key.cache_key
+      :foo_key
+    end
+    assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key([key])
+  end
+
 end
 
 class CacheStoreSettingTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From a650dd05f82028e8d1310f1b68b7bc430ea47dcf Mon Sep 17 00:00:00 2001
From: Olek Janiszewski <olek.janiszewski@gmail.com>
Date: Wed, 23 Nov 2011 18:11:36 +0100
Subject: Fix #3737 AS::expand_cache_key generates wrong key in certain
 situations (part 2)

`nil` and `false` both expand to `""` (empty string), while `true` expands to
`"true"`; `false` should expand to `"false"`
---
 activesupport/test/caching_test.rb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 5c844b8122..8871b1b0e9 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -42,7 +42,7 @@ class CacheKeyTest < ActiveSupport::TestCase
     end
   end
 
-  def test_respond_to_cache_key
+  def test_expand_cache_key_respond_to_cache_key
     key = 'foo'
     def key.cache_key
       :foo_key
@@ -50,7 +50,7 @@ class CacheKeyTest < ActiveSupport::TestCase
     assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key(key)
   end
 
-  def test_array_with_something_that_responds_to_cache_key
+  def test_expand_cache_key_array_with_something_that_responds_to_cache_key
     key = 'foo'
     def key.cache_key
       :foo_key
@@ -58,6 +58,17 @@ class CacheKeyTest < ActiveSupport::TestCase
     assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key([key])
   end
 
+  def test_expand_cache_key_of_nil
+    assert_equal '', ActiveSupport::Cache.expand_cache_key(nil)
+  end
+
+  def test_expand_cache_key_of_false
+    assert_equal 'false', ActiveSupport::Cache.expand_cache_key(false)
+  end
+
+  def test_expand_cache_key_of_true
+    assert_equal 'true', ActiveSupport::Cache.expand_cache_key(true)
+  end
 end
 
 class CacheStoreSettingTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From 3ee0116c949dfc5760d60fe9c77168fb3868a4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Nov 2011 18:22:09 +0000
Subject: Optimize cache expansion by skipping rails cache id in nested keys.

---
 activesupport/test/caching_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'activesupport/test/caching_test.rb')

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 8871b1b0e9..5d7464c623 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -12,11 +12,11 @@ class CacheKeyTest < ActiveSupport::TestCase
     begin
       ENV['RAILS_CACHE_ID'] = 'c99'
       assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
-      assert_equal 'c99/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
-      assert_equal 'c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
+      assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
+      assert_equal 'c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
       assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key(:foo, :nm)
-      assert_equal 'nm/c99/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
-      assert_equal 'nm/c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
+      assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
+      assert_equal 'nm/c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
     ensure
       ENV['RAILS_CACHE_ID'] = nil
     end
-- 
cgit v1.2.3