From 9b4aa9bcd9cb03f689eed374e870dd5a46e4a661 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 5 Feb 2009 21:00:44 +0100
Subject: [PATCH] Revert "created unit tests and fixed bug that failed tests"

This reverts commit be1dbf321aba03c2e9bec423f753308e9bba3ef5.
---
 activesupport/lib/active_support/cache.rb |  2 +-
 activesupport/test/caching_test.rb        | 22 +---------------------
 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 @@ def silence!
       #   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 @@ def test_should_read_and_write_nil
     @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' }
-- 
GitLab