Fix project deletion and tests

2 files changed, 4 insertions, 25 deletions

diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index f415e750dd5..1fdd959da9d 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -65,26 +65,4 @@ describe Event do
     it { @event.branch_name.should == "master" }
     it { @event.author.should == @user }
   end
-
-  describe 'Team events' do
-    let(:user_project) { double.as_null_object }
-    let(:observer) { UsersProjectObserver.instance }
-
-    before {
-      Event.should_receive :create
-      observer.stub(notification: double.as_null_object)
-    }
-
-    describe "Joined project team" do
-      it "should create event" do
-        observer.after_create user_project
-      end
-    end
-
-    describe "Left project team" do
-      it "should create event" do
-        observer.after_destroy user_project
-      end
-    end
-  end
 end
diff --git a/spec/models/system_hook_spec.rb b/spec/models/system_hook_spec.rb
index 51aaccf2267..2b98acdeb6c 100644
--- a/spec/models/system_hook_spec.rb
+++ b/spec/models/system_hook_spec.rb
@@ -25,13 +25,14 @@ describe SystemHook do
     end
 
     it "project_create hook" do
-      project = create(:project)
+      Projects::CreateService.new(create(:user), name: 'empty').execute
       WebMock.should have_requested(:post, @system_hook.url).with(body: /project_create/).once
     end
 
     it "project_destroy hook" do
-      project = create(:project)
-      project.destroy
+      user = create(:user)
+      project = create(:empty_project, namespace: user.namespace)
+      Projects::DestroyService.new(project, user, {}).execute
       WebMock.should have_requested(:post, @system_hook.url).with(body: /project_destroy/).once
     end