aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-02-05 21:00:44 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-02-05 21:00:44 +0100
commit9b4aa9bcd9cb03f689eed374e870dd5a46e4a661 (patch)
tree2db409c7d6fa5cd4467e6055f68deb95ddb46efe /activesupport
parentbe1dbf321aba03c2e9bec423f753308e9bba3ef5 (diff)
downloadrails-9b4aa9bcd9cb03f689eed374e870dd5a46e4a661.tar.gz
rails-9b4aa9bcd9cb03f689eed374e870dd5a46e4a661.tar.bz2
rails-9b4aa9bcd9cb03f689eed374e870dd5a46e4a661.zip
Revert "created unit tests and fixed bug that failed tests"
This reverts commit be1dbf321aba03c2e9bec423f753308e9bba3ef5.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/cache.rb2
-rw-r--r--activesupport/test/caching_test.rb22
2 files changed, 2 insertions, 22 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 0f848c5933..83174d3a85 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -138,7 +138,7 @@ module ActiveSupport
# cache.fetch("foo") # => nil
def fetch(key, options = {})
@logger_off = true
- if !options[:force] && ((value = read(key, options)) || exist?(key, options))
+ if !options[:force] && value = read(key, options)
@logger_off = false
log("hit", key, options)
value
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index e5105e92a2..4e212f1661 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -90,27 +90,7 @@ module CacheStoreBehavior
@cache.write('foo', nil)
assert_equal nil, @cache.read('foo')
end
-
- def test_should_read_and_write_false
- @cache.write('foo', false)
- assert_equal false, @cache.read('foo')
- end
-
- def test_should_read_and_write_true
- @cache.write('foo', true)
- assert_equal true, @cache.read('foo')
- end
-
- def test_fetch_false_without_cache_miss
- @cache.write('foo', false)
- assert_equal false, @cache.fetch('foo') { 'baz' }
- end
-
- def test_fetch_nil_without_cache_miss
- @cache.write('foo', nil)
- assert_equal nil, @cache.fetch('foo') { 'baz' }
- end
-
+
def test_fetch_without_cache_miss
@cache.write('foo', 'bar')
assert_equal 'bar', @cache.fetch('foo') { 'baz' }