diff --git a/test/unit/comment_helper_test.rb b/test/unit/comment_helper_test.rb
new file mode 100644
index 0000000..217cb35
--- /dev/null
+++ b/test/unit/comment_helper_test.rb
@@ -0,0 +1,85 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CommentHelperTest < ActiveSupport::TestCase
+
+  include CommentHelper
+  include ActionView::Helpers::TagHelper
+  include NoosferoTestHelper
+
+  def setup
+    @user = create_user('usertest').person
+    @profile = @user
+    self.stubs(:logged_in?).returns(true)
+    self.stubs(:report_abuse).returns('<a href="#">link</a>')
+    self.stubs(:expirable_comment_link).returns('<a href="#">link</a>')
+    @plugins.stubs(:dispatch).returns([])
+  end
+
+  attr_reader :user, :profile
+
+  should 'show menu if it has links for actions' do
+    comment = Comment.new
+    menu = comment_actions(comment)
+    assert menu
+  end
+  
+  should 'do not show menu if it has no actions' do
+    comment = Comment.new
+    self.stubs(:links_for_comment_actions).returns([])
+    menu = comment_actions(comment)
+    assert !menu
+  end
+
+  should 'include actions of plugins in menu' do
+    comment = Comment.new
+    plugin_action = {:link => 'plugin_action'}
+    @plugins.stubs(:dispatch).returns([plugin_action])
+    links = links_for_comment_actions(comment)
+    assert_includes links, plugin_action
+  end
+  
+  should 'return link for report abuse action when comment has a author' do
+    comment = Comment.new
+    comment.author = user
+    link = link_for_report_abuse(comment)
+    assert link
+  end
+  
+  should 'do not return link for report abuse action when comment has no author' do
+    comment = Comment.new
+    link = link_for_report_abuse(comment)
+    assert !link
+  end
+
+  should 'return link for mark comment as spam' do
+    comment = Comment.new
+    link = link_for_spam(comment)
+    assert_match /Mark as SPAM/, link[:link]
+  end
+
+  should 'return link for mark comment as not spam' do
+    comment = Comment.new
+    comment.spam = true
+    link = link_for_spam(comment)
+    assert_match /Mark as NOT SPAM/, link[:link]
+  end
+
+  should 'do not return link for edit comment' do
+    comment = Comment.new
+    link = link_for_edit(comment)
+    assert !link
+  end
+
+  should 'return link for edit comment' do
+    comment = Comment.new
+    comment.author = user
+    link = link_for_edit(comment)
+    assert link
+  end
+
+  def link_to_function(content, url, options = {})
+    link_to(content, url, options)
+  end
+
+end
+
--
libgit2 0.21.2