Merge remote-tracking branch 'participa/AI2931-comment_group_fixes' into AI2931-comment_group_fixes

Joenio Costa
2 parents 48a01d20 f50aa6ef
Showing 2 changed files with 12 additions and 4 deletions Show diff stats
plugins/comment_group/lib/ext/article.rb
plugins/comment_group/test/unit/article_test.rb
@@ -7,8 +7,8 @@ class Article
   validate :not_empty_group_comments_removed
   def not_empty_group_comments_removed
-    if body
-      groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
+    if body && body_changed?
+      groups_with_comments = Comment.find(:all, :select => 'distinct group_id', :conditions => {:source_id => self.id}).map(&:group_id).compact
       groups = Hpricot(body.to_s).search('.macro').collect{|element| element['data-macro-group_id'].to_i}
       errors.add_to_base(N_('Not empty group comment cannot be removed')) unless (groups_with_comments-groups).empty?
     end
@@ -16,16 +16,24 @@ class ArticleTest &lt; ActiveSupport::TestCase
   end
   should 'do not allow a exclusion of a group comment macro if this group has comments' do
-    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=2></div>")
+    article.body = "<div class=\"macro\" data-macro-group_id=2></div>"
     comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
     assert !article.save
     assert_equal 'Not empty group comment cannot be removed', article.errors[:base]
   end
   should 'allow save if comment group macro is not removed for group with comments' do
-    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=1></div>")
+    article.body = "<div class=\"macro\" data-macro-group_id=1></div>"
     comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
     assert article.save
   end
+  should 'do not validate empty group if article body is not changed' do
+    article.body = "<div class=\"macro\" data-macro-group_id=2></div>"
+    assert article.save
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    article.name = article.name + 'changed'
+    assert article.save
+  end
+
 end