0
@@ -111,7 +111,11 @@ class Article < Content
0
   end
0
 
0
   def accept_comments?
0
-    status == :published && (comment_age.to_i > -1) && (published_at + comment_age.to_i.days > Time.now.utc)
0
+    status == :published && (comment_age > -1) && (comment_age == 0 || comments_expired_at > Time.now.utc)
0
+  end
0
+
0
+  def comments_expired_at
0
+    published_at + comment_age.days
0
   end
0
 
0
   # leave out macro_filter, that is turned on/off with parse_macros?

0
@@ -66,15 +66,23 @@ class ArticleTest < Test::Unit::TestCase
0
     contents(:welcome).body_html = 'nope'
0
     assert !contents(:welcome).save_version?
0
   end
0
-  
0
+
0
+  def test_comment_expiration_date
0
+    a = create_fake_article
0
+    assert_equal 5.days.from_now.utc.to_i, a.comments_expired_at.to_i
0
+  end
0
+
0
   def test_comment_expiry
0
-    a = Article.new :comment_age => 10, :published_at => 5.days.from_now.utc
0
-    def a.new_record?() false ; end
0
+    a = create_fake_article(5.days.from_now)
0
     assert !a.accept_comments?
0
     a.published_at = 5.days.ago.utc
0
     assert  a.accept_comments?
0
     a.comment_age = 2
0
     assert !a.accept_comments?
0
+    a.published_at = 5.years.ago.utc
0
+    assert !a.accept_comments?
0
+    a.comment_age = 0
0
+    assert  a.accept_comments?
0
   end
0
 
0
   def test_empty_body
0
@@ -114,4 +122,10 @@ class ArticleTest < Test::Unit::TestCase
0
     def create_article(options = {})
0
       Article.create options.reverse_merge(:user_id => 1, :site_id => 1, :title => 'foo')
0
     end
0
+    
0
+    def create_fake_article(time = 5.days.ago)
0
+      returning Article.new(:comment_age => 10, :published_at => time.utc) do |a|
0
+        def a.new_record?() false ; end
0
+      end
0
+    end
0
 end