Replace MemoryStore mutex with a monitor to avoid issues with nested calls

1 files changed, 24 insertions, 0 deletions

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index c5f7fb7fdd..ce27b464f8 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -97,3 +97,27 @@ class FileStoreTest < Test::Unit::TestCase
     File.delete("foo.cache")
   end
 end
+
+class MemoryStoreTest < Test::Unit::TestCase
+  def setup
+    @cache = ActiveSupport::Cache.lookup_store(:memory_store)
+  end
+
+  def test_should_read_and_write
+    @cache.write('foo', 'bar')
+    assert_equal 'bar', @cache.read('foo')
+  end
+
+  def test_fetch_without_cache_miss
+    @cache.write('foo', 'bar')
+    assert_equal 'bar', @cache.fetch('foo') { 'baz' }
+  end
+
+  def test_fetch_with_cache_miss
+    assert_equal 'baz', @cache.fetch('foo') { 'baz' }
+  end
+
+  def test_fetch_with_forced_cache_miss
+    @cache.fetch('foo', :force => true) { 'bar' }
+  end
+end