diff --git a/CHANGELOG b/CHANGELOG index 6784c1f258faa029e93dd4ae124fd036624117f0..f1346885ab48d055a159202c9570bf13473a2f56 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,7 +42,7 @@ v 7.8.0 - - - - - + - Add action property to merge request hook (Julien Bianchi) - - - diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 7f3421b8e4ba9c16dd9ef8a399ffef693427ec9f..b4199d1c800e4fb7289d2e417546538eefdd3664 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -5,9 +5,12 @@ module MergeRequests Note.create_status_change_note(merge_request, merge_request.target_project, current_user, merge_request.state, nil) end - def execute_hooks(merge_request) + def execute_hooks(merge_request, action = 'open') if merge_request.project hook_data = merge_request.to_hook_data(current_user) + merge_request_url = Gitlab::UrlBuilder.new(:merge_request).build(merge_request.id) + hook_data[:object_attributes][:url] = merge_request_url + hook_data[:object_attributes][:action] = action merge_request.project.execute_hooks(hook_data, :merge_request_hooks) end end diff --git a/app/services/merge_requests/close_service.rb b/app/services/merge_requests/close_service.rb index 64e37a23e6b57af9ff2ec87895091ab0548b5c99..4249a84f3823e071122f7d16b2e85a3f5a886fa9 100644 --- a/app/services/merge_requests/close_service.rb +++ b/app/services/merge_requests/close_service.rb @@ -9,7 +9,7 @@ module MergeRequests event_service.close_mr(merge_request, current_user) notification_service.close_mr(merge_request, current_user) create_note(merge_request) - execute_hooks(merge_request) + execute_hooks(merge_request, 'close') end merge_request diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 5de7247d617ae6024517f9c2c0e2e8bee0b2c9b4..1e1614028f7692c108fe9b55246cab216f2aa656 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -12,7 +12,7 @@ module MergeRequests notification_service.merge_mr(merge_request, current_user) create_merge_event(merge_request, current_user) create_note(merge_request) - execute_hooks(merge_request) + execute_hooks(merge_request, 'merge') true rescue diff --git a/app/services/merge_requests/reopen_service.rb b/app/services/merge_requests/reopen_service.rb index bd68919a5509f93d2972d30cbc7e09cdf391b512..a2a9c933f630a7e3bf8226406462255acdae3221 100644 --- a/app/services/merge_requests/reopen_service.rb +++ b/app/services/merge_requests/reopen_service.rb @@ -5,7 +5,7 @@ module MergeRequests event_service.reopen_mr(merge_request, current_user) notification_service.reopen_mr(merge_request, current_user) create_note(merge_request) - execute_hooks(merge_request) + execute_hooks(merge_request, 'reopen') merge_request.reload_code merge_request.mark_as_unchecked end diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index fc26619cd173542baa47fe6f8f14008408e0286b..56c8510e0aeb4b3fac3150d38baeaefd7285c613 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -38,7 +38,7 @@ module MergeRequests end merge_request.notice_added_references(merge_request.project, current_user) - execute_hooks(merge_request) + execute_hooks(merge_request, 'update') end merge_request diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md index e17d21b990d2d4e9a12ab80527e445b9bfbd9352..e3399e5f1b8a3b7220fffd906d157699d5a314af 100644 --- a/doc/web_hooks/web_hooks.md +++ b/doc/web_hooks/web_hooks.md @@ -166,7 +166,9 @@ Triggered when a new merge request is created or an existing merge request was u "name": "GitLab dev user", "email": "gitlabdev@dv6700.(none)" } - } + }, + "url": "http://example.com/diaspora/merge_requests/1", + "action": "open" } } ``` diff --git a/spec/services/merge_requests/close_service_spec.rb b/spec/services/merge_requests/close_service_spec.rb index a504f916b08c6eaf17a21636b16ebb4c7318a507..5060a67bebf52aeef96178a607ced56b2c04f4eb 100644 --- a/spec/services/merge_requests/close_service_spec.rb +++ b/spec/services/merge_requests/close_service_spec.rb @@ -12,14 +12,23 @@ describe MergeRequests::CloseService do end describe :execute do - context "valid params" do + context 'valid params' do + let(:service) { MergeRequests::CloseService.new(project, user, {}) } + before do - @merge_request = MergeRequests::CloseService.new(project, user, {}).execute(merge_request) + service.stub(:execute_hooks) + + @merge_request = service.execute(merge_request) end it { @merge_request.should be_valid } it { @merge_request.should be_closed } + it 'should execute hooks with close action' do + expect(service).to have_received(:execute_hooks). + with(@merge_request, 'close') + end + it 'should send email to user2 about assign of new merge_request' do email = ActionMailer::Base.deliveries.last email.to.first.should == user2.email @@ -28,7 +37,7 @@ describe MergeRequests::CloseService do it 'should create system note about merge_request reassign' do note = @merge_request.notes.last - note.note.should include "Status changed to closed" + note.note.should include 'Status changed to closed' end end end diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb index cebeb0644d0b527aece51263bce35c44149ae3d9..dbd2114369060b2092c9abecc475c37ff6b6a586 100644 --- a/spec/services/merge_requests/create_service_spec.rb +++ b/spec/services/merge_requests/create_service_spec.rb @@ -5,21 +5,30 @@ describe MergeRequests::CreateService do let(:user) { create(:user) } describe :execute do - context "valid params" do - before do - project.team << [user, :master] - opts = { + context 'valid params' do + let(:opts) do + { title: 'Awesome merge_request', description: 'please fix', source_branch: 'stable', target_branch: 'master' } + end + let(:service) { MergeRequests::CreateService.new(project, user, opts) } + + before do + project.team << [user, :master] + service.stub(:execute_hooks) - @merge_request = MergeRequests::CreateService.new(project, user, opts).execute + @merge_request = service.execute end it { @merge_request.should be_valid } it { @merge_request.title.should == 'Awesome merge_request' } + + it 'should execute hooks with default action' do + expect(service).to have_received(:execute_hooks).with(@merge_request) + end end end end diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb new file mode 100644 index 0000000000000000000000000000000000000000..5f61fd3187bb6ba0edfa987ce3dd7fbac1536237 --- /dev/null +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -0,0 +1,44 @@ +require 'spec_helper' + +describe MergeRequests::MergeService do + let(:user) { create(:user) } + let(:user2) { create(:user) } + let(:merge_request) { create(:merge_request, assignee: user2) } + let(:project) { merge_request.project } + + before do + project.team << [user, :master] + project.team << [user2, :developer] + end + + describe :execute do + context 'valid params' do + let(:service) { MergeRequests::MergeService.new(project, user, {}) } + + before do + service.stub(:execute_hooks) + + service.execute(merge_request, 'Awesome message') + end + + it { merge_request.should be_valid } + it { merge_request.should be_merged } + + it 'should execute hooks with merge action' do + expect(service).to have_received(:execute_hooks). + with(merge_request, 'merge') + end + + it 'should send email to user2 about merge of new merge_request' do + email = ActionMailer::Base.deliveries.last + email.to.first.should == user2.email + email.subject.should include(merge_request.title) + end + + it 'should create system note about merge_request merge' do + note = merge_request.notes.last + note.note.should include 'Status changed to merged' + end + end + end +end diff --git a/spec/services/merge_requests/reopen_service_spec.rb b/spec/services/merge_requests/reopen_service_spec.rb new file mode 100644 index 0000000000000000000000000000000000000000..2a7066124dc6227d48c0672d721587466c180c97 --- /dev/null +++ b/spec/services/merge_requests/reopen_service_spec.rb @@ -0,0 +1,45 @@ +require 'spec_helper' + +describe MergeRequests::ReopenService do + let(:user) { create(:user) } + let(:user2) { create(:user) } + let(:merge_request) { create(:merge_request, assignee: user2) } + let(:project) { merge_request.project } + + before do + project.team << [user, :master] + project.team << [user2, :developer] + end + + describe :execute do + context 'valid params' do + let(:service) { MergeRequests::ReopenService.new(project, user, {}) } + + before do + service.stub(:execute_hooks) + + merge_request.state = :closed + service.execute(merge_request) + end + + it { merge_request.should be_valid } + it { merge_request.should be_reopened } + + it 'should execute hooks with reopen action' do + expect(service).to have_received(:execute_hooks). + with(merge_request, 'reopen') + end + + it 'should send email to user2 about reopen of merge_request' do + email = ActionMailer::Base.deliveries.last + email.to.first.should == user2.email + email.subject.should include(merge_request.title) + end + + it 'should create system note about merge_request reopen' do + note = merge_request.notes.last + note.note.should include 'Status changed to reopened' + end + end + end +end diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index af5d3a3dc817e0f9a727c15cc0e08dfd1a73141a..c8f40f48bab2e2ba23ccffe5e2f37bbb8fe962ec 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -12,16 +12,21 @@ describe MergeRequests::UpdateService do end describe :execute do - context "valid params" do - before do - opts = { + context 'valid params' do + let(:opts) do + { title: 'New title', description: 'Also please fix', assignee_id: user2.id, state_event: 'close' } + end + let(:service) { MergeRequests::UpdateService.new(project, user, opts) } + + before do + service.stub(:execute_hooks) - @merge_request = MergeRequests::UpdateService.new(project, user, opts).execute(merge_request) + @merge_request = service.execute(merge_request) end it { @merge_request.should be_valid } @@ -29,6 +34,11 @@ describe MergeRequests::UpdateService do it { @merge_request.assignee.should == user2 } it { @merge_request.should be_closed } + it 'should execute hooks with update action' do + expect(service).to have_received(:execute_hooks). + with(@merge_request, 'update') + end + it 'should send email to user2 about assign of new merge_request' do email = ActionMailer::Base.deliveries.last email.to.first.should == user2.email