Merge 'master' branch

1 files changed, 30 insertions, 0 deletions

diff --git a/spec/observers/users_project_observer_spec.rb b/spec/observers/users_project_observer_spec.rb
index 5bc4c877c15..650321ce91c 100644
--- a/spec/observers/users_project_observer_spec.rb
+++ b/spec/observers/users_project_observer_spec.rb
@@ -23,6 +23,17 @@ describe UsersProjectObserver do
       Notify.should_receive(:project_access_granted_email).with(users_project.id).and_return(double(deliver: true))
       subject.after_commit(users_project)
     end
+    it "should create new event" do
+      Event.should_receive(:create).with(
+        project_id: users_project.project.id, 
+        action: Event::Joined, 
+        author_id: users_project.user.id
+      )
+      subject.after_create(users_project)
+    end
+  end
+
+  describe "#after_update" do
     it "should called when UsersProject updated" do
       subject.should_receive(:after_commit).once
       UsersProject.observers.enable :users_project_observer do
@@ -40,4 +51,23 @@ describe UsersProjectObserver do
       end
     end
   end
+  describe "#after_destroy" do
+    it "should called when UsersProject destroyed" do
+      subject.should_receive(:after_destroy)
+      UsersProject.observers.enable :users_project_observer do
+        UsersProject.bulk_delete(
+          users_project.project,
+          [users_project.user.id]
+        )
+      end
+    end
+    it "should create new event" do
+      Event.should_receive(:create).with(
+        project_id: users_project.project.id, 
+        action: Event::Left, 
+        author_id: users_project.user.id
+      )
+      subject.after_destroy(users_project)
+    end
+  end
 end