0
@@ -1,5 +1,5 @@
0
 class Admin::ArticlesController < Admin::BaseController
0
-  with_options :only => [:create, :update] do |c|
0
+  with_options :only => [:create, :update, :destroy] do |c|
0
     c.before_filter :set_default_section_ids
0
     c.cache_sweeper :article_sweeper, :section_sweeper, :assigned_section_sweeper
0
     cache_sweeper   :comment_sweeper, :only => [:approve, :unapprove, :destroy_comment]

0
@@ -13,7 +13,7 @@ class Article < Content
0
     end
0
   end
0
 
0
-  has_many :assigned_sections, :dependent => :delete_all
0
+  has_many :assigned_sections, :dependent => :destroy
0
   has_many :sections, :through => :assigned_sections, :order => 'sections.name'
0
   has_many :events,   :order => 'created_at desc', :dependent => :delete_all
0
   with_options :order => 'created_at', :class_name => 'Comment' do |comment|

0
@@ -50,6 +50,11 @@ module Mephisto
0
         assert_redirected_to "/admin/articles"
0
       end
0
 
0
+      def remove_article(article)
0
+        post "/admin/articles/destroy/#{article.id}"
0
+        assert_equal 200, status, "Removing article #{article.id}"
0
+      end
0
+
0
       def create(params)
0
         post '/admin/articles/create', to_article_params(params)
0
         assert_redirected_to "/admin/articles"

0
@@ -193,6 +193,22 @@ class CachingTest < ActionController::IntegrationTest
0
     end
0
   end
0
 
0
+  def test_should_expire_section_and_article_cache_when_deleting_article
0
+    visitor = visit
0
+    
0
+    visit_sections_and_feeds_with visitor
0
+    visitor.read contents(:site_map)
0
+    
0
+    assert_expires_pages feed_url_for(:about), section_url_for(:about), contents(:site_map).full_permalink do
0
+      login_as :quentin do |writer|
0
+        writer.remove_article contents(:site_map)
0
+      end
0
+    end
0
+
0
+    assert_cached section_url_for(:home)
0
+    assert_cached feed_url_for(:home)
0
+  end
0
+
0
   protected
0
     def visit_sections_and_feeds_with(visitor)
0
       assert_difference CachedPage, :count, 4 do