Commit 9a032901 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Mention SystemHook user_id in sample. Extend tests

parent 3d51147d
...@@ -52,7 +52,8 @@ ...@@ -52,7 +52,8 @@
"created_at": "2012-07-21T07:44:07Z", "created_at": "2012-07-21T07:44:07Z",
"email": "js@gitlabhq.com", "email": "js@gitlabhq.com",
"event_name": "user_create", "event_name": "user_create",
"name": "John Smith" "name": "John Smith",
"user_id": 41
} }
6. User removed: 6. User removed:
...@@ -60,7 +61,8 @@ ...@@ -60,7 +61,8 @@
"created_at": "2012-07-21T07:44:07Z", "created_at": "2012-07-21T07:44:07Z",
"email": "js@gitlabhq.com", "email": "js@gitlabhq.com",
"event_name": "user_destroy", "event_name": "user_destroy",
"name": "John Smith" "name": "John Smith",
"user_id": 41
} }
eos eos
......
...@@ -5,37 +5,29 @@ describe SystemHooksService do ...@@ -5,37 +5,29 @@ describe SystemHooksService do
let (:project) { create :project } let (:project) { create :project }
let (:users_project) { create :users_project } let (:users_project) { create :users_project }
context 'it should build event data' do context 'event data' do
it 'should build event data for user' do it { event_data(user, :create).should include(:event_name, :name, :created_at, :email, :user_id) }
SystemHooksService.build_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 end
it 'should build event data for project' do context 'event names' do
SystemHooksService.build_event_data(project, :create).should include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email) 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 end
it 'should build event data for users project' do def event_data(*args)
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) SystemHooksService.build_event_data(*args)
end end
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" def event_name(*args)
end SystemHooksService.build_event_name(*args)
it 'should build event names for users project' do
SystemHooksService.build_event_name(users_project, :create).should eq "user_add_to_team"
SystemHooksService.build_event_name(users_project, :destroy).should eq "user_remove_from_team"
end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment