1 files changed, 6 insertions, 4 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 0845d2edea3..2f6a20a1b24 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -26,6 +26,9 @@
 require 'spec_helper'
 
 describe Project do
+  before(:each) { enable_observers }
+  after(:each) { disable_observers }
+
   describe "Associations" do
     it { should belong_to(:group) }
     it { should belong_to(:namespace) }
@@ -95,12 +98,11 @@ describe Project do
   end
 
   describe "last_activity methods" do
-    before { enable_observers }
-    let(:project)    { create(:project) }
+    let(:project) { create(:project) }
     let(:last_event) { double(created_at: Time.now) }
 
     describe "last_activity" do
-      it "should alias last_activity to last_event"do
+      it "should alias last_activity to last_event" do
         project.stub(last_event: last_event)
         project.last_activity.should == last_event
       end
@@ -122,7 +124,7 @@ describe Project do
     let(:project) { create(:project_with_code) }
 
     before do
-      @merge_request = create(:merge_request, project: project)
+      @merge_request = create(:merge_request, source_project: project, target_project: project)
       @key = create(:key, user_id: project.owner.id)
     end