Merge branch 'feature/system_hook_user_id' of /home/git/repositories/gitlab/gitlabhq

3 files changed, 26 insertions, 31 deletions

diff --git a/app/services/system_hooks_service.rb b/app/services/system_hooks_service.rb
index 39aec943f75..de4fa9b79e7 100644
--- a/app/services/system_hooks_service.rb
+++ b/app/services/system_hooks_service.rb
@@ -36,7 +36,8 @@ class SystemHooksService
     when User
       data.merge!({
         name: model.name,
-        email: model.email
+        email: model.email,
+        user_id: model.id
       })
     when UsersProject
       data.merge!({
diff --git a/app/views/admin/hooks/_data_ex.html.erb b/app/views/admin/hooks/_data_ex.html.erb
index b69aa92716d..5b16dfb398a 100644
--- a/app/views/admin/hooks/_data_ex.html.erb
+++ b/app/views/admin/hooks/_data_ex.html.erb
@@ -52,7 +52,8 @@
    "created_at": "2012-07-21T07:44:07Z",
         "email": "js@gitlabhq.com",
    "event_name": "user_create",
-         "name": "John Smith" 
+         "name": "John Smith", 
+      "user_id": 41 
 }
 
 6. User removed:
@@ -60,7 +61,8 @@
    "created_at": "2012-07-21T07:44:07Z",
         "email": "js@gitlabhq.com",
    "event_name": "user_destroy",
-         "name": "John Smith" 
+         "name": "John Smith",
+      "user_id": 41 
 }
 
 eos
diff --git a/spec/services/system_hooks_service_spec.rb b/spec/services/system_hooks_service_spec.rb
index 7f1590f559e..ebc1ed51d2e 100644
--- a/spec/services/system_hooks_service_spec.rb
+++ b/spec/services/system_hooks_service_spec.rb
@@ -5,37 +5,29 @@ describe SystemHooksService do
   let (:project)       { create :project }
   let (:users_project) { create :users_project }
 
-  context 'it should build event data' do
-    it 'should build event data for user' do
-      SystemHooksService.build_event_data(user, :create).should include(:event_name, :name, :created_at, :email)
-    end
-
-    it 'should build event data for project' do
-      SystemHooksService.build_event_data(project, :create).should include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email)
-    end
-
-    it 'should build event data for users project' do
-      SystemHooksService.build_event_data(users_project, :create).should include(:event_name, :created_at, :project_name, :project_path, :project_id, :user_name, :user_email, :project_access)
-    end
+  context 'event data' do
+    it { event_data(user, :create).should include(:event_name, :name, :created_at, :email, :user_id) }
+    it { event_data(user, :destroy).should include(:event_name, :name, :created_at, :email, :user_id) }
+    it { event_data(project, :create).should include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email) }
+    it { event_data(project, :destroy).should include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email) }
+    it { event_data(users_project, :create).should include(:event_name, :created_at, :project_name, :project_path, :project_id, :user_name, :user_email, :project_access) }
+    it { event_data(users_project, :destroy).should include(:event_name, :created_at, :project_name, :project_path, :project_id, :user_name, :user_email, :project_access) }
   end
 
-  context 'it should build event names' do
-    it 'should build event names for user' do
-      SystemHooksService.build_event_name(user, :create).should eq "user_create"
-
-      SystemHooksService.build_event_name(user, :destroy).should eq "user_destroy"
-    end
-
-    it 'should build event names for project' do
-      SystemHooksService.build_event_name(project, :create).should eq "project_create"
-
-      SystemHooksService.build_event_name(project, :destroy).should eq "project_destroy"
-    end
+  context 'event names' do
+    it { event_name(user, :create).should eq "user_create" }
+    it { event_name(user, :destroy).should eq "user_destroy" }
+    it { event_name(project, :create).should eq "project_create" }
+    it { event_name(project, :destroy).should eq "project_destroy" }
+    it { event_name(users_project, :create).should eq "user_add_to_team" }
+    it { event_name(users_project, :destroy).should eq "user_remove_from_team" }
+  end
 
-    it 'should build event names for users project' do
-      SystemHooksService.build_event_name(users_project, :create).should eq "user_add_to_team"
+  def event_data(*args)
+    SystemHooksService.build_event_data(*args)
+  end
 
-      SystemHooksService.build_event_name(users_project, :destroy).should eq "user_remove_from_team"
-    end
+  def event_name(*args)
+    SystemHooksService.build_event_name(*args)
   end
 end