[comments-refactor-review] Small fixes on ApproveComment task and its tests

Rodrigo Souto
1 parent b5af58d1
Showing 2 changed files with 5 additions and 9 deletions Show diff stats
app/models/approve_comment.rb
test/unit/approve_comment_test.rb
 class ApproveComment < Task
   validates_presence_of :target_id
-   settings_items :comment_attributes, :closing_statment
+  settings_items :comment_attributes, :closing_statment
-   validates_presence_of :comment_attributes
+  validates_presence_of :comment_attributes
   def comment
-     @comment ||= Comment.new(JSON.parse(self.comment_attributes)) unless self.comment_attributes.nil?
-     @comment
+    @comment ||= Comment.new(JSON.parse(self.comment_attributes)) unless self.comment_attributes.nil?
   end
   def requestor_name
@@ -22,7 +21,6 @@ class ApproveComment &lt; Task
     article ? article.name : _("Article removed.")
   end
-
   def perform
     comment.save!
   end
@@ -33,8 +31,8 @@ class ApproveComment &lt; Task
   def icon
     result = {:type => :defined_image, :src => '/images/icons-app/article-minor.png'}
-    result.merge({:url => article.url}) if article
-    return result
+    result.merge!({:url => article.url}) if article
+    result
   end
   def linked_subject
@@ -144,8 +144,6 @@ class ApproveCommentTest &lt; ActiveSupport::TestCase
   end
   should 'default decision be skip if there is an article associated to task' do
-#    a = ApproveComment.create!(:name => 'test name', :target => @community, :comment_attributes => @comment.attributes.to_json, :requestor => @profile)
-#FIXME see if article= method will survive
     a = ApproveComment.new(:comment_attributes => @comment.attributes.to_json)
     assert 'skip', a.default_decision
   end