Add note when MR assignee changes. Add more tests to MR services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
8cc5e85543
commit
860f159d41
4 changed files with 108 additions and 0 deletions
|
@ -3,6 +3,10 @@ module MergeRequests
|
|||
|
||||
private
|
||||
|
||||
def create_assignee_note(merge_request)
|
||||
Note.create_assignee_change_note(merge_request, merge_request.project, current_user, merge_request.assignee)
|
||||
end
|
||||
|
||||
def create_note(merge_request)
|
||||
Note.create_status_change_note(merge_request, merge_request.target_project, current_user, merge_request.state, nil)
|
||||
end
|
||||
|
|
35
spec/services/merge_requests/close_service_spec.rb
Normal file
35
spec/services/merge_requests/close_service_spec.rb
Normal file
|
@ -0,0 +1,35 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe MergeRequests::CloseService 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
|
||||
before do
|
||||
@merge_request = MergeRequests::CloseService.new(project, user, {}).execute(merge_request)
|
||||
end
|
||||
|
||||
it { @merge_request.should be_valid }
|
||||
it { @merge_request.should be_closed }
|
||||
|
||||
it 'should send email to user2 about assign 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 reassign' do
|
||||
note = @merge_request.notes.last
|
||||
note.note.should include "Status changed to closed"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
25
spec/services/merge_requests/create_service_spec.rb
Normal file
25
spec/services/merge_requests/create_service_spec.rb
Normal file
|
@ -0,0 +1,25 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe MergeRequests::CreateService do
|
||||
let(:project) { create(:project) }
|
||||
let(:user) { create(:user) }
|
||||
|
||||
describe :execute do
|
||||
context "valid params" do
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
opts = {
|
||||
title: 'Awesome merge_request',
|
||||
description: 'please fix',
|
||||
source_branch: 'stable',
|
||||
target_branch: 'master'
|
||||
}
|
||||
|
||||
@merge_request = MergeRequests::CreateService.new(project, user, opts).execute
|
||||
end
|
||||
|
||||
it { @merge_request.should be_valid }
|
||||
it { @merge_request.title.should == 'Awesome merge_request' }
|
||||
end
|
||||
end
|
||||
end
|
44
spec/services/merge_requests/update_service_spec.rb
Normal file
44
spec/services/merge_requests/update_service_spec.rb
Normal file
|
@ -0,0 +1,44 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe MergeRequests::UpdateService do
|
||||
let(:user) { create(:user) }
|
||||
let(:user2) { create(:user) }
|
||||
let(:merge_request) { create(:merge_request, :simple) }
|
||||
let(:project) { merge_request.project }
|
||||
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
project.team << [user2, :developer]
|
||||
end
|
||||
|
||||
describe :execute do
|
||||
context "valid params" do
|
||||
before do
|
||||
opts = {
|
||||
title: 'New title',
|
||||
description: 'Also please fix',
|
||||
assignee_id: user2.id,
|
||||
state_event: 'close'
|
||||
}
|
||||
|
||||
@merge_request = MergeRequests::UpdateService.new(project, user, opts).execute(merge_request)
|
||||
end
|
||||
|
||||
it { @merge_request.should be_valid }
|
||||
it { @merge_request.title.should == 'New title' }
|
||||
it { @merge_request.assignee.should == user2 }
|
||||
it { @merge_request.should be_closed }
|
||||
|
||||
it 'should send email to user2 about assign 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 reassign' do
|
||||
note = @merge_request.notes.last
|
||||
note.note.should include "Reassigned to \@#{user2.username}"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in a new issue