From b79e00881ec441c7266e8aca6083a3eb9586cd40 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 14 Dec 2012 22:05:10 +0200
Subject: [PATCH] Uncommented test observing comment event

---
 app/models/milestone.rb                  |  6 +++++-
 app/observers/activity_observer.rb       |  2 +-
 spec/observers/activity_observer_spec.rb | 24 +++++++++++++-----------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 00bcbbff91f..4be0873658a 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -14,7 +14,7 @@
 
 class Milestone < ActiveRecord::Base
   attr_accessible :title, :description, :due_date, :closed, :author_id_of_changes
-  attr_accessor :author_id, :author_id_of_changes
+  attr_accessor :author_id_of_changes
 
   belongs_to :project
   has_many :issues
@@ -68,4 +68,8 @@ class Milestone < ActiveRecord::Base
   def open?
     !closed
   end
+
+  def author_id
+    author_id_of_changes
+  end
 end
diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb
index 6fb10423eb7..c188e5720ac 100644
--- a/app/observers/activity_observer.rb
+++ b/app/observers/activity_observer.rb
@@ -2,7 +2,7 @@ class ActivityObserver < ActiveRecord::Observer
   observe :issue, :merge_request, :note, :milestone
 
   def after_create(record)
-    event_author_id = record.author_id || record.author_id_of_changes
+    event_author_id = record.author_id
 
     # Skip status notes
     if record.kind_of?(Note) && record.note.include?("_Status changed to ")
diff --git a/spec/observers/activity_observer_spec.rb b/spec/observers/activity_observer_spec.rb
index 0eec41f44e9..6af5d070888 100644
--- a/spec/observers/activity_observer_spec.rb
+++ b/spec/observers/activity_observer_spec.rb
@@ -34,15 +34,17 @@ describe ActivityObserver do
     it { @event.target.should == @issue }
   end
 
-  #describe "Issue commented" do
-    #before do
-      #@issue = create(:issue, project: project)
-      #@note = create(:note, noteable: @issue, project: project)
-      #@event = Event.last
-    #end
-
-    #it_should_be_valid_event
-    #it { @event.action.should == Event::Commented }
-    #it { @event.target.should == @note }
-  #end
+  describe "Issue commented" do
+    before do
+      Note.observers.enable :activity_observer do
+        @issue = create(:issue, project: project)
+        @note = create(:note, noteable: @issue, project: project, author: @issue.author)
+        @event = Event.last
+      end
+    end
+
+    it_should_be_valid_event
+    it { @event.action.should == Event::Commented }
+    it { @event.target.should == @note }
+  end
 end
-- 
GitLab