debian-mirror-gitlab/spec/services/merge_requests/merge_service_spec.rb

92 lines
2.9 KiB
Ruby
Raw Normal View History

2015-04-26 12:48:37 +05:30
require 'spec_helper'
2015-12-23 02:04:40 +05:30
describe MergeRequests::MergeService, services: true do
2015-04-26 12:48:37 +05:30
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
2016-08-24 12:49:21 +05:30
describe '#execute' do
2015-04-26 12:48:37 +05:30
context 'valid params' do
2015-12-23 02:04:40 +05:30
let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
2015-04-26 12:48:37 +05:30
before do
allow(service).to receive(:execute_hooks)
2015-12-23 02:04:40 +05:30
perform_enqueued_jobs do
service.execute(merge_request)
end
2015-04-26 12:48:37 +05:30
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
2015-10-24 18:46:33 +05:30
2016-06-02 11:05:42 +05:30
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
2015-10-24 18:46:33 +05:30
context "error handling" do
2015-12-23 02:04:40 +05:30
let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
2015-10-24 18:46:33 +05:30
it 'saves error if there is an exception' do
allow(service).to receive(:repository).and_raise("error")
allow(service).to receive(:execute_hooks)
2015-12-23 02:04:40 +05:30
service.execute(merge_request)
2015-10-24 18:46:33 +05:30
expect(merge_request.merge_error).to eq("Something went wrong during merge")
end
2016-08-24 12:49:21 +05:30
it 'saves error if there is an PreReceiveError exception' do
allow(service).to receive(:repository).and_raise(GitHooksService::PreReceiveError, "error")
allow(service).to receive(:execute_hooks)
service.execute(merge_request)
expect(merge_request.merge_error).to eq("error")
end
it 'aborts if there is a merge conflict' do
allow_any_instance_of(Repository).to receive(:merge).and_return(false)
allow(service).to receive(:execute_hooks)
service.execute(merge_request)
expect(merge_request.open?).to be_truthy
expect(merge_request.merge_commit_sha).to be_nil
expect(merge_request.merge_error).to eq("Conflicts detected during merge")
end
2015-10-24 18:46:33 +05:30
end
2015-04-26 12:48:37 +05:30
end
end