Fixing specs & spinach since Wiki model does not exists any more

3 files changed, 2 insertions, 10 deletions

diff --git a/spec/factories.rb b/spec/factories.rb
index 9859fbf69c5..8f323161990 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -198,12 +198,6 @@ FactoryGirl.define do
     url
   end
 
-  factory :wiki do
-    title
-    content
-    user
-  end
-
   factory :snippet do
     project
     author
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index fa47a6354c8..21e4202f4ee 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe NotificationService do
-  # Disable observers to prevent factory trigger notification service
-  before(:all) { ActiveRecord::Base.observers.disable :all }
-  after(:all) { ActiveRecord::Base.observers.enable :all }
-
   let(:notification) { NotificationService.new }
 
   describe 'Keys' do
diff --git a/spec/services/project_transfer_service_spec.rb b/spec/services/project_transfer_service_spec.rb
index dea0b0b2998..7b11c9785a9 100644
--- a/spec/services/project_transfer_service_spec.rb
+++ b/spec/services/project_transfer_service_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe ProjectTransferService do
+  before(:each) { enable_observers }
+
   context 'namespace -> namespace' do
     let(:user) { create(:user) }
     let(:group) { create(:group) }