diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index f9cfed43b8..64394afec4 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -1,3 +1,5 @@ +require 'benchmark' + module ActiveSupport module Cache def self.lookup_store(*store_option) diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb index 4694cb11d1..a038f29f53 100644 --- a/activesupport/test/caching_test.rb +++ b/activesupport/test/caching_test.rb @@ -25,3 +25,29 @@ class CacheStoreSettingTest < Test::Unit::TestCase assert_equal "/path/to/cache/directory", store.cache_path end end + +uses_mocha 'high-level cache store tests' do + class CacheStoreTest < Test::Unit::TestCase + def setup + @cache = ActiveSupport::Cache.lookup_store(:memory_store) + end + + def test_fetch_without_cache_miss + @cache.stubs(:read).with('foo', {}).returns('bar') + @cache.expects(:write).never + assert_equal 'bar', @cache.fetch('foo') { 'baz' } + end + + def test_fetch_with_cache_miss + @cache.stubs(:read).with('foo', {}).returns(nil) + @cache.expects(:write).with('foo', 'baz', {}) + assert_equal 'baz', @cache.fetch('foo') { 'baz' } + end + + def test_fetch_with_forced_cache_miss + @cache.expects(:read).never + @cache.expects(:write).with('foo', 'bar', :force => true) + @cache.fetch('foo', :force => true) { 'bar' } + end + end +end