refactor observers test since email logic moved to service

1 files changed, 2 insertions, 108 deletions

diff --git a/spec/observers/note_observer_spec.rb b/spec/observers/note_observer_spec.rb
index 8ad42c21d2c..9ada92704b6 100644
--- a/spec/observers/note_observer_spec.rb
+++ b/spec/observers/note_observer_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe NoteObserver do
   subject { NoteObserver.instance }
+  before { subject.stub(notification: mock('NotificationService').as_null_object) }
 
   let(:team_without_author) { (1..2).map { |n| double :user, id: n } }
 
@@ -17,116 +18,9 @@ describe NoteObserver do
     end
 
     it 'sends out notifications' do
-      subject.should_receive(:send_notify_mails).with(note)
+      subject.should_receive(:notification)
 
       subject.after_create(note)
     end
   end
-
-  describe "#send_notify_mails" do
-    let(:note) { double :note, notify: false, notify_author: false }
-
-    it 'notifies team of new note when flagged to notify' do
-      note.stub(:notify).and_return(true)
-      subject.should_receive(:notify_team).with(note)
-
-      subject.after_create(note)
-    end
-
-    it 'does not notify team of new note when not flagged to notify' do
-      subject.should_not_receive(:notify_team).with(note)
-
-      subject.after_create(note)
-    end
-
-    it 'notifies the author of a commit when flagged to notify the author' do
-      note.stub(:notify_author).and_return(true)
-      note.stub(:noteable).and_return(double(author_email: 'test@test.com'))
-      note.stub(:id).and_return(42)
-      author = double :user, id: 1, email: 'test@test.com'
-      note.stub(:commit_author).and_return(author)
-      Notify.should_receive(:note_commit_email)
-
-      subject.after_create(note)
-    end
-
-    it 'does not notify the author of a commit when not flagged to notify the author' do
-      notify.should_not_receive(:note_commit_email)
-
-      subject.after_create(note)
-    end
-
-    it 'does nothing if no notify flags are set' do
-      subject.after_create(note).should be_nil
-    end
-  end
-
-  describe '#notify_team' do
-    let(:note) { double :note, id: 1 }
-
-    before :each do
-      subject.stub(:team_without_note_author).with(note).and_return(team_without_author)
-    end
-
-    context 'notifies team of a new note on' do
-      it 'a commit' do
-        note.stub(:noteable_type).and_return('Commit')
-        notify.should_receive(:note_commit_email).twice
-
-        subject.send(:notify_team, note)
-      end
-
-      it 'an issue' do
-        note.stub(:noteable_type).and_return('Issue')
-        notify.should_receive(:note_issue_email).twice
-
-        subject.send(:notify_team, note)
-      end
-
-      it 'a wiki page' do
-        note.stub(:noteable_type).and_return('Wiki')
-        notify.should_receive(:note_wiki_email).twice
-
-        subject.send(:notify_team, note)
-      end
-
-      it 'a merge request' do
-        note.stub(:noteable_type).and_return('MergeRequest')
-        notify.should_receive(:note_merge_request_email).twice
-
-        subject.send(:notify_team, note)
-      end
-
-      it 'a wall' do
-        # Note: wall posts have #noteable_type of nil
-        note.stub(:noteable_type).and_return(nil)
-        notify.should_receive(:note_wall_email).twice
-
-        subject.send(:notify_team, note)
-      end
-    end
-
-    it 'does nothing for a new note on a snippet' do
-      note.stub(:noteable_type).and_return('Snippet')
-
-      subject.send(:notify_team, note).should be_nil
-    end
-  end
-
-
-  describe '#team_without_note_author' do
-    let(:author) { double :user, id: 4 }
-
-    let(:users) { team_without_author + [author] }
-    let(:project)  { double :project, users: users }
-    let(:note) { double :note, project: project, author: author }
-
-    it 'returns the projects user without the note author included' do
-      subject.send(:team_without_note_author, note).should == team_without_author
-    end
-  end
-
-  def notify
-    Notify
-  end
 end