0
@@ -34,7 +34,8 @@ class CachingTest < ActionController::IntegrationTest
0
     assert_difference Article, :count do
0
       assert_expires_pages section_url_for(:home),
0
                            feed_url_for(:home) do
0
-        writer.create :title => 'This is a new article & title', :body => 'this is a new article body', :sections => [sections(:home)], :published_at => Time.now
0
+        writer.create :title => 'This is a new article & title', :body => 'this is a new article body', :sections => [sections(:home)], :published_at => 5.minutes.ago
0
+        RAILS_DEFAULT_LOGGER.warn "HOLY FUCKING SHIT"
0
       end
0
     end
0
     
0
@@ -129,27 +130,31 @@ class CachingTest < ActionController::IntegrationTest
0
   def test_should_not_cache_bad_urls
0
     visitor = visit
0
     pages   = ['/about/blah', '/foo/bar', '2006/1/2/fasd']
0
-    assert_expires_pages *pages do
0
-      pages.each { |p| visitor.get p }
0
+    assert_no_difference CachedPage, :count do
0
+      assert_expires_pages *pages do
0
+        pages.each { |p| visitor.get p }
0
+      end
0
     end
0
   end
0
 
0
   protected
0
     def visit_sections_and_feeds_with(visitor)
0
-      assert_caches_page section_url_for(:home) do
0
-        visitor.read sections(:home)
0
-      end
0
-
0
-      assert_caches_page section_url_for(:about) do
0
-        visitor.read sections(:about)
0
-      end
0
-
0
-      assert_caches_page feed_url_for(:home) do
0
-        visitor.syndicate sections(:home)
0
-      end
0
-
0
-      assert_caches_page feed_url_for(:about) do
0
-        visitor.syndicate sections(:about)
0
+      assert_difference CachedPage, :count, 4 do
0
+        assert_caches_page section_url_for(:home) do
0
+          visitor.read sections(:home)
0
+        end
0
+        
0
+        assert_caches_page section_url_for(:about) do
0
+          visitor.read sections(:about)
0
+        end
0
+        
0
+        assert_caches_page feed_url_for(:home) do
0
+          visitor.syndicate sections(:home)
0
+        end
0
+        
0
+        assert_caches_page feed_url_for(:about) do
0
+          visitor.syndicate sections(:about)
0
+        end
0
       end
0
     end
0
 end
0
\ No newline at end of file

0
@@ -17,20 +17,21 @@ module Caboose # :nodoc:
0
       end
0
 
0
       protected
0
-      # An array of the current page's references.
0
-      #
0
-      #   self.cached_references << @post
0
-      #   self.cached_references += @post.comments
0
-      # 
0
-      def cached_references
0
-        @cached_references ||= []
0
-      end
0
-
0
-      # Saves a CachedPage for the current request with the current references.  This is called in an after filter if #caches_page_with_references
0
-      # is used.
0
-      def cache_page_with_references
0
-        CachedPage.create_by_url(url_for(:only_path => true, :skip_relative_url_root => true), cached_references)
0
-      end
0
+        # An array of the current page's references.
0
+        #
0
+        #   self.cached_references << @post
0
+        #   self.cached_references += @post.comments
0
+        # 
0
+        def cached_references
0
+          @cached_references ||= []
0
+        end
0
+        
0
+        # Saves a CachedPage for the current request with the current references.  This is called in an after filter if #caches_page_with_references
0
+        # is used.
0
+        def cache_page_with_references
0
+          return unless perform_caching && caching_allowed
0
+          CachedPage.create_by_url(url_for(:only_path => true, :skip_relative_url_root => true), cached_references)
0
+        end
0
     end
0
   end
0
 end
0
\ No newline at end of file