Specs refactoring to reduce test time. Disabled observers by default for specs

4 files changed, 14 insertions, 53 deletions

diff --git a/spec/observers/issue_observer_spec.rb b/spec/observers/issue_observer_spec.rb
index 539c65507cc..3cc621013d2 100644
--- a/spec/observers/issue_observer_spec.rb
+++ b/spec/observers/issue_observer_spec.rb
@@ -4,11 +4,7 @@ describe IssueObserver do
   let(:some_user)      { create :user }
   let(:assignee)       { create :user }
   let(:author)         { create :user }
-  let(:mock_issue)     { double(:issue, id: 42, assignee: assignee, author: author) }
-  let(:assigned_issue)   { create(:issue, assignee: assignee, author: author) }
-  let(:unassigned_issue) { create(:issue, author: author) }
-  let(:closed_assigned_issue)   { create(:closed_issue, assignee: assignee, author: author) }
-  let(:closed_unassigned_issue) { create(:closed_issue, author: author) }
+  let(:mock_issue)     { create(:issue, assignee: assignee, author: author) }
 
 
   before { subject.stub(:current_user).and_return(some_user) }
@@ -18,15 +14,6 @@ describe IssueObserver do
   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
-        create(:issue, project: create(:project))
-      end
-    end
-
     it 'trigger notification to send emails' do
       subject.should_receive(:notification)
 
@@ -36,41 +23,28 @@ describe IssueObserver do
 
   context '#after_close' do
     context 'a status "closed"' do
+      before { mock_issue.stub(state: 'closed') }
+
       it 'note is created if the issue is being closed' do
-        Note.should_receive(:create_status_change_note).with(assigned_issue, some_user, 'closed')
+        Note.should_receive(:create_status_change_note).with(mock_issue, some_user, 'closed')
 
-        assigned_issue.close
+        subject.after_close(mock_issue, nil)
       end
 
       it 'trigger notification to send emails' do
-        subject.should_receive(:notification)
-
-        assigned_issue.close
-      end
+        subject.notification.should_receive(:close_issue).with(mock_issue, some_user)
 
-      it 'creates a note' do
-        Note.should_receive(:create_status_change_note).with(unassigned_issue, some_user, 'closed')
-        unassigned_issue.close
+        subject.after_close(mock_issue, nil)
       end
     end
 
     context 'a status "reopened"' do
-      it 'note is created if the issue is being reopened' do
-        Note.should_receive(:create_status_change_note).with(closed_assigned_issue, some_user, 'reopened')
-
-        closed_assigned_issue.reopen
-      end
-
-      it 'trigger notification to send emails' do
-        subject.should_receive(:notification)
-
-        closed_assigned_issue.reopen
-      end
+      before { mock_issue.stub(state: 'reopened') }
 
-      it 'create a note' do
-        Note.should_receive(:create_status_change_note).with(closed_unassigned_issue, some_user, 'reopened')
+      it 'note is created if the issue is being reopened' do
+        Note.should_receive(:create_status_change_note).with(mock_issue, some_user, 'reopened')
 
-        closed_unassigned_issue.reopen
+        subject.after_reopen(mock_issue, nil)
       end
     end
   end
@@ -80,16 +54,6 @@ describe IssueObserver do
       mock_issue.stub(:is_being_reassigned?).and_return(false)
     end
 
-    it 'is called when an issue is changed' do
-      changed = create(:issue, project: create(:project))
-      subject.should_receive(:after_update)
-
-      Issue.observers.enable :issue_observer do
-        changed.description = 'I changed'
-        changed.save
-      end
-    end
-
     context 'notification' do
       it 'triggered if the issue is being reassigned' do
         mock_issue.should_receive(:is_being_reassigned?).and_return(true)
diff --git a/spec/observers/merge_request_observer_spec.rb b/spec/observers/merge_request_observer_spec.rb
index 2593da7280d..24a05646cb5 100644
--- a/spec/observers/merge_request_observer_spec.rb
+++ b/spec/observers/merge_request_observer_spec.rb
@@ -16,12 +16,6 @@ describe MergeRequestObserver do
   subject { MergeRequestObserver.instance }
 
   describe '#after_create' do
-
-    it 'is called when a merge request is created' do
-      subject.should_receive(:after_create)
-      create(:merge_request, project: create(:project))
-    end
-
     it 'trigger notification service' do
       subject.should_receive(:notification)
       subject.after_create(mr_mock)
diff --git a/spec/observers/user_observer_spec.rb b/spec/observers/user_observer_spec.rb
index 5b735a8f39c..e0902b7eaf3 100644
--- a/spec/observers/user_observer_spec.rb
+++ b/spec/observers/user_observer_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe UserObserver do
+  before(:each) { enable_observers }
   subject { UserObserver.instance }
   before { subject.stub(notification: mock('NotificationService').as_null_object) }
 
diff --git a/spec/observers/users_project_observer_spec.rb b/spec/observers/users_project_observer_spec.rb
index c034501e7d9..66d5c7d91af 100644
--- a/spec/observers/users_project_observer_spec.rb
+++ b/spec/observers/users_project_observer_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe UsersProjectObserver do
+  before(:each) { enable_observers }
+
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   subject { UsersProjectObserver.instance }