0
@@ -11,7 +11,18 @@ class CommentSweeper < ActionController::Caching::Sweeper
0
   def after_save(record)
0
     return if controller.nil? || (@new && !record.approved?)
0
     expire_overview_feed!
0
-    pages = CachedPage.find_by_reference(record.article)
0
-    expire_cached_pages "Expired pages referenced by #{record.class} ##{record.id}", *pages
0
+    expire_cache_for record
0
   end
0
+  
0
+  def after_destroy(record)
0
+    return if controller.nil?
0
+    expire_overview_feed!
0
+    expire_cache_for record if record.approved?
0
+  end
0
+  
0
+  protected
0
+    def expire_cache_for(comment)
0
+      pages = CachedPage.find_by_reference(comment.article)
0
+      expire_cached_pages "Expired pages referenced by #{comment.class} ##{comment.id}", *pages
0
+    end
0
 end
0
\ No newline at end of file

0
@@ -78,11 +78,11 @@ class CachingTest < ActionController::IntegrationTest
0
     rss     = visit
0
     writer  = login_as :quentin
0
 
0
-    assert_caches_page overview_url(:only_path => true, :skip_relative_url_root => true) do
0
+    assert_caches_page overview_path do
0
       rss.get_with_basic 'admin/overview.xml', :login => :quentin
0
     end
0
 
0
-    assert_expires_page overview_url(:only_path => true, :skip_relative_url_root => true) do
0
+    assert_expires_page overview_path do
0
       writer.revise contents(:welcome), 'new welcome description'
0
     end
0
   end
0
@@ -137,6 +137,43 @@ class CachingTest < ActionController::IntegrationTest
0
     assert_not_cached contents(:welcome).full_permalink
0
   end
0
 
0
+  def test_should_expire_cache_when_approved_comment_is_deleted
0
+    visitor = visit
0
+    rss     = visit
0
+    writer  = login_as :quentin
0
+    assert_caches_page contents(:welcome).full_permalink do
0
+      visitor.read contents(:welcome)
0
+    end
0
+    
0
+    assert_caches_page overview_path do
0
+      rss.get_with_basic 'admin/overview.xml', :login => :quentin
0
+    end
0
+
0
+    assert_expires_pages overview_path, contents(:welcome).full_permalink do
0
+      writer.post "admin/articles/destroy_comment/#{contents(:welcome).id}", :comment => contents(:welcome_comment).id
0
+    end
0
+  end
0
+
0
+  def test_should_only_expire_overview_when_unapproved_comment_is_deleted
0
+    visitor = visit
0
+    rss     = visit
0
+    writer  = login_as :quentin
0
+    assert_caches_page contents(:welcome).full_permalink do
0
+      visitor.read contents(:welcome)
0
+    end
0
+
0
+    assert_caches_page overview_path do
0
+      rss.get_with_basic 'admin/overview.xml', :login => :quentin
0
+    end
0
+
0
+    assert_expires_pages overview_path do
0
+      contents(:welcome_comment).update_attribute :approved, false
0
+      writer.post "admin/articles/destroy_comment/#{contents(:welcome).id}", :comment => contents(:welcome_comment).id
0
+    end
0
+
0
+    assert_cached contents(:welcome).full_permalink
0
+  end
0
+
0
   def test_should_not_cache_bad_urls
0
     visitor = visit
0
     pages   = ['/about/blah', '/foo/bar', '2006/1/2/fasd']