Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer

10 files changed, 300 insertions, 28 deletions

diff --git a/spec/models/activity_observer_spec.rb b/spec/models/activity_observer_spec.rb
index 91c7d9147b2..aed1b26d306 100644
--- a/spec/models/activity_observer_spec.rb
+++ b/spec/models/activity_observer_spec.rb
@@ -9,9 +9,11 @@ describe ActivityObserver do
   end
 
   describe "Merge Request created" do 
-    before do 
-      @merge_request = Factory :merge_request, :project => project
-      @event = Event.last
+    before do
+      MergeRequest.observers.enable :activity_observer do
+        @merge_request = Factory :merge_request, :project => project
+        @event = Event.last
+      end
     end
 
     it_should_be_valid_event
@@ -20,9 +22,11 @@ describe ActivityObserver do
   end
 
   describe "Issue created" do 
-    before do 
-      @issue = Factory :issue, :project => project
-      @event = Event.last
+    before do
+      Issue.observers.enable :activity_observer do
+        @issue = Factory :issue, :project => project
+        @event = Event.last
+      end
     end
 
     it_should_be_valid_event
diff --git a/spec/models/issue_observer_spec.rb b/spec/models/issue_observer_spec.rb
new file mode 100644
index 00000000000..2b9798f7e53
--- /dev/null
+++ b/spec/models/issue_observer_spec.rb
@@ -0,0 +1,144 @@
+require 'spec_helper'
+
+describe IssueObserver do
+  let(:some_user) { double(:user, :id => 1) }
+  let(:assignee) { double(:user, :id => 2) }
+  let(:issue)    { double(:issue, :id => 42, :assignee => assignee) }
+
+  before(:each) { subject.stub(:current_user).and_return(some_user) }
+
+  subject { IssueObserver.instance }
+
+  describe '#after_create' do
+
+    it 'is called when an issue is created' do
+      subject.should_receive(:after_create)
+
+      Issue.observers.enable :issue_observer do
+        Factory.create(:issue, :project => Factory.create(:project))
+      end
+    end
+
+    it 'sends an email to the assignee' do
+      Notify.should_receive(:new_issue_email).with(issue.id).
+        and_return(double(:deliver => true))
+
+      subject.after_create(issue)
+    end
+
+    it 'does not send an email to the assignee if assignee created the issue' do
+      subject.stub(:current_user).and_return(assignee)
+      Notify.should_not_receive(:new_issue_email)
+
+      subject.after_create(issue)
+    end
+  end
+
+  context '#after_update' do
+    before(:each) do
+      issue.stub(:is_being_reassigned?).and_return(false)
+      issue.stub(:is_being_closed?).and_return(false)
+      issue.stub(:is_being_reopened?).and_return(false)
+    end
+
+    it 'is called when an issue is changed' do
+      changed = Factory.create(:issue, :project => Factory.create(:project))
+      subject.should_receive(:after_update)
+
+      Issue.observers.enable :issue_observer do
+        changed.description = 'I changed'
+        changed.save
+      end
+    end
+
+    context 'a reassigned email' do
+      it 'is sent if the issue is being reassigned' do
+        issue.should_receive(:is_being_reassigned?).and_return(true)
+        subject.should_receive(:send_reassigned_email).with(issue)
+
+        subject.after_update(issue)
+      end
+
+      it 'is not sent if the issue is not being reassigned' do
+        issue.should_receive(:is_being_reassigned?).and_return(false)
+        subject.should_not_receive(:send_reassigned_email)
+
+        subject.after_update(issue)
+      end
+    end
+
+    context 'a status "closed" note' do
+      it 'is created if the issue is being closed' do
+        issue.should_receive(:is_being_closed?).and_return(true)
+        Note.should_receive(:create_status_change_note).with(issue, some_user, 'closed')
+
+        subject.after_update(issue)
+      end
+
+      it 'is not created if the issue is not being closed' do
+        issue.should_receive(:is_being_closed?).and_return(false)
+        Note.should_not_receive(:create_status_change_note).with(issue, some_user, 'closed')
+
+        subject.after_update(issue)
+      end
+    end
+
+    context 'a status "reopened" note' do
+      it 'is created if the issue is being reopened' do
+        issue.should_receive(:is_being_reopened?).and_return(true)
+        Note.should_receive(:create_status_change_note).with(issue, some_user, 'reopened')
+
+        subject.after_update(issue)
+      end
+
+      it 'is not created if the issue is not being reopened' do
+        issue.should_receive(:is_being_reopened?).and_return(false)
+        Note.should_not_receive(:create_status_change_note).with(issue, some_user, 'reopened')
+
+        subject.after_update(issue)
+      end
+    end
+  end
+
+  describe '#send_reassigned_email' do
+    let(:previous_assignee) { double(:user, :id => 3) }
+
+    before(:each) do
+      issue.stub(:assignee_id).and_return(assignee.id)
+      issue.stub(:assignee_id_was).and_return(previous_assignee.id)
+    end
+
+    def it_sends_a_reassigned_email_to(recipient)
+      Notify.should_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id).
+        and_return(double(:deliver => true))
+    end
+
+    def it_does_not_send_a_reassigned_email_to(recipient)
+      Notify.should_not_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id)
+    end
+
+    it 'sends a reassigned email to the previous and current assignees' do
+      it_sends_a_reassigned_email_to assignee.id
+      it_sends_a_reassigned_email_to previous_assignee.id
+
+      subject.send(:send_reassigned_email, issue)
+    end
+
+    context 'does not send an email to the user who made the reassignment' do
+      it 'if the user is the assignee' do
+        subject.stub(:current_user).and_return(assignee)
+        it_sends_a_reassigned_email_to previous_assignee.id
+        it_does_not_send_a_reassigned_email_to assignee.id
+
+        subject.send(:send_reassigned_email, issue)
+      end
+      it 'if the user is the previous assignee' do
+        subject.stub(:current_user).and_return(previous_assignee)
+        it_sends_a_reassigned_email_to assignee.id
+        it_does_not_send_a_reassigned_email_to previous_assignee.id
+
+        subject.send(:send_reassigned_email, issue)
+      end
+    end
+  end
+end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 791e9cdeb9f..fd3af62d74d 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -20,10 +20,60 @@ describe Issue do
     it { Issue.should respond_to :opened }
   end
 
-  it { Factory.create(:issue,
-                      :author => Factory(:user),
-                      :assignee => Factory(:user),
-                      :project => Factory.create(:project)).should be_valid }
+  subject { Factory.create(:issue,
+                           :author => Factory(:user),
+                           :assignee => Factory(:user),
+                           :project => Factory.create(:project)) }
+  it { should be_valid }
+
+  describe '#is_being_reassigned?' do
+    it 'returns true if the issue assignee has changed' do
+      subject.assignee = Factory(:user)
+      subject.is_being_reassigned?.should be_true
+    end
+    it 'returns false if the issue assignee has not changed' do
+      subject.is_being_reassigned?.should be_false
+    end
+  end
+
+  describe '#is_being_closed?' do
+    it 'returns true if the closed attribute has changed and is now true' do
+      subject.closed = true
+      subject.is_being_closed?.should be_true
+    end
+    it 'returns false if the closed attribute has changed and is now false' do
+      issue = Factory.create(:issue,
+                             :closed => true,
+                             :author => Factory(:user),
+                             :assignee => Factory(:user),
+                             :project => Factory.create(:project))
+      issue.closed = false
+      issue.is_being_closed?.should be_false
+    end
+    it 'returns false if the closed attribute has not changed' do
+      subject.is_being_closed?.should be_false
+    end
+  end
+
+
+  describe '#is_being_reopened?' do
+    it 'returns true if the closed attribute has changed and is now false' do
+      issue = Factory.create(:issue,
+                             :closed => true,
+                             :author => Factory(:user),
+                             :assignee => Factory(:user),
+                             :project => Factory.create(:project))
+      issue.closed = false
+      issue.is_being_reopened?.should be_true
+    end
+    it 'returns false if the closed attribute has changed and is now true' do
+      subject.closed = true
+      subject.is_being_reopened?.should be_false
+    end
+    it 'returns false if the closed attribute has not changed' do
+      subject.is_being_reopened?.should be_false
+    end
+  end
 
   describe "plus 1" do
     let(:project) { Factory(:project) }
@@ -56,6 +106,7 @@ describe Issue do
       subject.upvotes.should == 2
     end
   end
+
 end
 # == Schema Information
 #
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index c74f7277810..af6ee9b889b 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -70,6 +70,25 @@ describe Note do
     end
   end
 
+  describe '#create_status_change_note' do
+    let(:project)  { Factory.create(:project) }
+    let(:thing)    { Factory.create(:issue, :project => project) }
+    let(:author)   { Factory(:user) }
+    let(:status)   { 'new_status' }
+
+    subject { Note.create_status_change_note(thing, author, status) }
+
+    it 'creates and saves a Note' do
+      should be_a Note
+      subject.id.should_not be_nil
+    end
+
+    its(:noteable) { should == thing }
+    its(:project)  { should == thing.project }
+    its(:author)   { should == author }
+    its(:note)     { should =~ /Status changed to #{status}/ }
+  end
+
   describe :authorization do
     before do
       @p1 = project
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 6285a852c23..d28668b2445 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -72,16 +72,29 @@ describe Project do
   end
 
   describe "last_activity" do
-    let(:project) { Factory :project }
+    let(:project)    { Factory :project }
+    let(:last_event) { double }
 
     before do
-      @issue = Factory :issue, :project => project
+      project.stub(:events).and_return( [ double, double, last_event ] )
     end
 
-    it { project.last_activity.should == Event.last }
-    it { project.last_activity_date.to_s.should == Event.last.created_at.to_s }
+    it { project.last_activity.should == last_event }
   end
 
+  describe 'last_activity_date' do
+    let(:project)    { Factory :project }
+
+    it 'returns the creation date of the project\'s last event if present' do
+      last_event = double(:created_at => 'now')
+      project.stub(:events).and_return( [double, double, last_event] )
+      project.last_activity_date.should == last_event.created_at
+    end
+
+    it 'returns the project\'s last update date if it has no events' do
+      project.last_activity_date.should == project.updated_at
+    end
+  end
   describe "fresh commits" do
     let(:project) { Factory :project }
 
diff --git a/spec/models/user_observer_spec.rb b/spec/models/user_observer_spec.rb
new file mode 100644
index 00000000000..23dac98bb74
--- /dev/null
+++ b/spec/models/user_observer_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe UserObserver do
+  subject { UserObserver.instance }
+
+  it 'calls #after_create when new users are created' do
+    new_user = Factory.new(:user)
+    subject.should_receive(:after_create).with(new_user)
+
+    User.observers.enable :user_observer do
+      new_user.save
+    end
+  end
+
+  context 'when a new user is created' do
+    let(:user) { double(:user, id: 42, password: 'P@ssword!') }
+    let(:notification) { double :notification }
+
+    it 'sends an email' do
+      notification.should_receive(:deliver)
+      Notify.should_receive(:new_user_email).with(user.id, user.password).and_return(notification)
+
+      subject.after_create(user)
+    end
+  end
+end
diff --git a/spec/requests/admin/admin_projects_spec.rb b/spec/requests/admin/admin_projects_spec.rb
index 9a33c6936a7..fb6577de326 100644
--- a/spec/requests/admin/admin_projects_spec.rb
+++ b/spec/requests/admin/admin_projects_spec.rb
@@ -88,6 +88,7 @@ describe "Admin::Projects" do
       fill_in 'Name', :with => 'NewProject'
       fill_in 'Code', :with => 'NPR'
       fill_in 'Path', :with => 'gitlabhq_1'
+      fill_in 'Description', :with => 'New Project Description'
       expect { click_button "Save" }.to change { Project.count }.by(1)
       @project = Project.last
     end
diff --git a/spec/requests/admin/admin_users_spec.rb b/spec/requests/admin/admin_users_spec.rb
index 91082a644b5..ba6831e3d8b 100644
--- a/spec/requests/admin/admin_users_spec.rb
+++ b/spec/requests/admin/admin_users_spec.rb
@@ -41,16 +41,23 @@ describe "Admin::Users" do
 
     it "should call send mail" do
       Notify.should_receive(:new_user_email).and_return(stub(:deliver => true))
-      click_button "Save"
+
+      User.observers.enable :user_observer do
+        click_button "Save"
+      end
     end
 
     it "should send valid email to user with email & password" do
-      click_button "Save"
-      user = User.last
-      email = ActionMailer::Base.deliveries.last
-      email.subject.should have_content("Account was created")
-      email.body.should have_content(user.email)
-      email.body.should have_content(@password)
+      User.observers.enable :user_observer do
+        with_resque do
+          click_button "Save"
+        end
+        user = User.last
+        email = ActionMailer::Base.deliveries.last
+        email.subject.should have_content("Account was created")
+        email.body.should have_content(user.email)
+        email.body.should have_content(@password)
+      end
     end
   end
 
diff --git a/spec/requests/issues_spec.rb b/spec/requests/issues_spec.rb
index 5c59675b459..2c8650a8402 100644
--- a/spec/requests/issues_spec.rb
+++ b/spec/requests/issues_spec.rb
@@ -128,16 +128,22 @@ describe "Issues" do
         end
 
         it "should call send mail" do
-          Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
-          click_button "Submit new issue"
+          Issue.observers.enable :issue_observer do
+            Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
+            click_button "Submit new issue"
+          end
         end
 
         it "should send valid email to user" do
-          click_button "Submit new issue"
-          issue = Issue.last
-          email = ActionMailer::Base.deliveries.last
-          email.subject.should have_content("New Issue was created")
-          email.body.should have_content(issue.title)
+          Issue.observers.enable :issue_observer do
+            with_resque do
+              click_button "Submit new issue"
+            end
+            issue = Issue.last
+            email = ActionMailer::Base.deliveries.last
+            email.subject.should have_content("New Issue was created")
+            email.body.should have_content(issue.title)
+          end
         end
 
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 18b7854d102..5556798f511 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -52,6 +52,7 @@ RSpec.configure do |config|
     DatabaseCleaner.start
 
     WebMock.disable_net_connect!(allow_localhost: true)
+    ActiveRecord::Base.observers.disable :all
   end
 
   config.after do