71 lines
2.1 KiB
Ruby
71 lines
2.1 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe MergeRequests::MergeService, services: true 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, commit_message: 'Awesome message') }
|
|
|
|
before do
|
|
allow(service).to receive(:execute_hooks)
|
|
|
|
perform_enqueued_jobs do
|
|
service.execute(merge_request)
|
|
end
|
|
end
|
|
|
|
it { expect(merge_request).to be_valid }
|
|
it { expect(merge_request).to be_merged }
|
|
|
|
it 'should send email to user2 about merge of new merge_request' do
|
|
email = ActionMailer::Base.deliveries.last
|
|
expect(email.to.first).to eq(user2.email)
|
|
expect(email.subject).to include(merge_request.title)
|
|
end
|
|
|
|
it 'should create system note about merge_request merge' do
|
|
note = merge_request.notes.last
|
|
expect(note.note).to include 'Status changed to merged'
|
|
end
|
|
end
|
|
|
|
context 'remove source branch by author' do
|
|
let(:service) do
|
|
merge_request.merge_params['force_remove_source_branch'] = '1'
|
|
merge_request.save!
|
|
MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message')
|
|
end
|
|
|
|
it 'removes the source branch' do
|
|
expect(DeleteBranchService).to receive(:new).
|
|
with(merge_request.source_project, merge_request.author).
|
|
and_call_original
|
|
service.execute(merge_request)
|
|
end
|
|
end
|
|
|
|
context "error handling" do
|
|
let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
|
|
|
|
it 'saves error if there is an exception' do
|
|
allow(service).to receive(:repository).and_raise("error")
|
|
|
|
allow(service).to receive(:execute_hooks)
|
|
|
|
service.execute(merge_request)
|
|
|
|
expect(merge_request.merge_error).to eq("Something went wrong during merge")
|
|
end
|
|
end
|
|
end
|
|
end
|