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

311 lines
11 KiB
Ruby
Raw Normal View History

2015-04-26 12:48:37 +05:30
require 'spec_helper'
2017-09-10 17:25:29 +05:30
describe MergeRequests::MergeService do
2018-03-17 18:26:18 +05:30
set(:user) { create(:user) }
set(:user2) { create(:user) }
2017-09-10 17:25:29 +05:30
let(:merge_request) { create(:merge_request, :simple, author: user2, assignee: user2) }
2015-04-26 12:48:37 +05:30
let(:project) { merge_request.project }
before do
2018-11-18 11:00:15 +05:30
project.add_maintainer(user)
2018-03-17 18:26:18 +05:30
project.add_developer(user2)
2015-04-26 12:48:37 +05:30
end
2016-08-24 12:49:21 +05:30
describe '#execute' do
2015-04-26 12:48:37 +05:30
context 'valid params' do
2017-09-10 17:25:29 +05:30
let(:service) { described_class.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 }
2016-09-13 17:45:13 +05:30
it 'sends email to user2 about merge of new merge_request' do
2015-04-26 12:48:37 +05:30
email = ActionMailer::Base.deliveries.last
expect(email.to.first).to eq(user2.email)
expect(email.subject).to include(merge_request.title)
end
2016-09-13 17:45:13 +05:30
it 'creates system note about merge_request merge' do
2015-04-26 12:48:37 +05:30
note = merge_request.notes.last
2017-08-17 22:00:37 +05:30
expect(note.note).to include 'merged'
2015-04-26 12:48:37 +05:30
end
end
2015-10-24 18:46:33 +05:30
2016-11-03 12:29:30 +05:30
context 'closes related issues' do
let(:service) { described_class.new(project, user, commit_message: 'Awesome message') }
before do
allow(project).to receive(:default_branch).and_return(merge_request.target_branch)
end
it 'closes GitLab issue tracker issues' do
issue = create :issue, project: project
commit = double('commit', safe_message: "Fixes #{issue.to_reference}")
allow(merge_request).to receive(:commits).and_return([commit])
2018-11-18 11:00:15 +05:30
merge_request.cache_merge_request_closes_issues!
2016-11-03 12:29:30 +05:30
service.execute(merge_request)
expect(issue.reload.closed?).to be_truthy
end
context 'with JIRA integration' do
include JiraServiceHelper
let(:jira_tracker) { project.create_jira_service }
2017-08-17 22:00:37 +05:30
let(:jira_issue) { ExternalIssue.new('JIRA-123', project) }
let(:commit) { double('commit', safe_message: "Fixes #{jira_issue.to_reference}") }
2016-11-03 12:29:30 +05:30
before do
2018-11-18 11:00:15 +05:30
project.update!(has_external_issue_tracker: true)
2016-11-03 12:29:30 +05:30
jira_service_settings
2017-08-17 22:00:37 +05:30
stub_jira_urls(jira_issue.id)
allow(merge_request).to receive(:commits).and_return([commit])
2016-11-03 12:29:30 +05:30
end
it 'closes issues on JIRA issue tracker' do
jira_issue = ExternalIssue.new('JIRA-123', project)
2017-08-17 22:00:37 +05:30
stub_jira_urls(jira_issue)
2016-11-03 12:29:30 +05:30
commit = double('commit', safe_message: "Fixes #{jira_issue.to_reference}")
allow(merge_request).to receive(:commits).and_return([commit])
expect_any_instance_of(JiraService).to receive(:close_issue).with(merge_request, jira_issue).once
service.execute(merge_request)
end
2017-08-17 22:00:37 +05:30
context "when jira_issue_transition_id is not present" do
2017-09-10 17:25:29 +05:30
before do
allow_any_instance_of(JIRA::Resource::Issue).to receive(:resolution).and_return(nil)
end
2017-08-17 22:00:37 +05:30
it "does not close issue" do
allow(jira_tracker).to receive_messages(jira_issue_transition_id: nil)
expect_any_instance_of(JiraService).not_to receive(:transition_issue)
service.execute(merge_request)
end
end
2016-11-03 12:29:30 +05:30
context "wrong issue markdown" do
it 'does not close issues on JIRA issue tracker' do
2017-08-17 22:00:37 +05:30
jira_issue = ExternalIssue.new('#JIRA-123', project)
stub_jira_urls(jira_issue)
2016-11-03 12:29:30 +05:30
commit = double('commit', safe_message: "Fixes #{jira_issue.to_reference}")
allow(merge_request).to receive(:commits).and_return([commit])
expect_any_instance_of(JiraService).not_to receive(:close_issue)
service.execute(merge_request)
end
end
end
end
context 'closes related todos' do
let(:merge_request) { create(:merge_request, assignee: user, author: user) }
let(:project) { merge_request.project }
2017-09-10 17:25:29 +05:30
let(:service) { described_class.new(project, user, commit_message: 'Awesome message') }
2016-11-03 12:29:30 +05:30
let!(:todo) do
create(:todo, :assigned,
project: project,
author: user,
user: user,
target: merge_request)
end
before do
allow(service).to receive(:execute_hooks)
perform_enqueued_jobs do
service.execute(merge_request)
todo.reload
end
end
it { expect(todo).to be_done }
end
2017-09-10 17:25:29 +05:30
context 'source branch removal' do
context 'when the source branch is protected' do
let(:service) do
2018-03-17 18:26:18 +05:30
described_class.new(project, user, 'should_remove_source_branch' => true)
2017-09-10 17:25:29 +05:30
end
before do
create(:protected_branch, project: project, name: merge_request.source_branch)
end
it 'does not delete the source branch' do
expect(DeleteBranchService).not_to receive(:new)
service.execute(merge_request)
end
2016-06-02 11:05:42 +05:30
end
2017-09-10 17:25:29 +05:30
context 'when the source branch is the default branch' do
let(:service) do
2018-03-17 18:26:18 +05:30
described_class.new(project, user, 'should_remove_source_branch' => true)
2017-09-10 17:25:29 +05:30
end
before do
allow(project).to receive(:root_ref?).with(merge_request.source_branch).and_return(true)
end
it 'does not delete the source branch' do
expect(DeleteBranchService).not_to receive(:new)
service.execute(merge_request)
end
end
context 'when the source branch can be removed' do
context 'when MR author set the source branch to be removed' do
2018-03-17 18:26:18 +05:30
let(:service) { described_class.new(project, user, commit_message: 'Awesome message') }
before do
merge_request.update_attribute(:merge_params, { 'force_remove_source_branch' => '1' })
2017-09-10 17:25:29 +05:30
end
it 'removes the source branch using the author user' do
expect(DeleteBranchService).to receive(:new)
.with(merge_request.source_project, merge_request.author)
.and_call_original
service.execute(merge_request)
end
2018-03-17 18:26:18 +05:30
context 'when the merger set the source branch not to be removed' do
let(:service) { described_class.new(project, user, commit_message: 'Awesome message', 'should_remove_source_branch' => false) }
it 'does not delete the source branch' do
expect(DeleteBranchService).not_to receive(:new)
service.execute(merge_request)
end
end
2017-09-10 17:25:29 +05:30
end
context 'when MR merger set the source branch to be removed' do
let(:service) do
2018-03-17 18:26:18 +05:30
described_class.new(project, user, commit_message: 'Awesome message', 'should_remove_source_branch' => true)
2017-09-10 17:25:29 +05:30
end
it 'removes the source branch using the current user' do
expect(DeleteBranchService).to receive(:new)
.with(merge_request.source_project, user)
.and_call_original
service.execute(merge_request)
end
end
2016-06-02 11:05:42 +05:30
end
end
2015-10-24 18:46:33 +05:30
context "error handling" do
2017-09-10 17:25:29 +05:30
let(:service) { described_class.new(project, user, commit_message: 'Awesome message') }
2015-10-24 18:46:33 +05:30
2017-08-17 22:00:37 +05:30
before do
allow(Rails.logger).to receive(:error)
end
2015-10-24 18:46:33 +05:30
2017-08-17 22:00:37 +05:30
it 'logs and saves error if there is an exception' do
error_message = 'error message'
allow(service).to receive(:repository).and_raise("error message")
2015-10-24 18:46:33 +05:30
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
2018-10-15 14:42:47 +05:30
expect(merge_request.merge_error).to include('Something went wrong during merge')
2017-08-17 22:00:37 +05:30
expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
2015-10-24 18:46:33 +05:30
end
2016-08-24 12:49:21 +05:30
2017-08-17 22:00:37 +05:30
it 'logs and saves error if there is an PreReceiveError exception' do
error_message = 'error message'
2016-08-24 12:49:21 +05:30
2018-11-08 19:23:39 +05:30
allow(service).to receive(:repository).and_raise(Gitlab::Git::PreReceiveError, error_message)
2016-08-24 12:49:21 +05:30
allow(service).to receive(:execute_hooks)
service.execute(merge_request)
2018-10-15 14:42:47 +05:30
expect(merge_request.merge_error).to include('Something went wrong during merge pre-receive hook')
2017-08-17 22:00:37 +05:30
expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
2016-08-24 12:49:21 +05:30
end
2017-08-17 22:00:37 +05:30
it 'logs and saves error if there is a merge conflict' do
error_message = 'Conflicts detected during merge'
2016-08-24 12:49:21 +05:30
allow_any_instance_of(Repository).to receive(:merge).and_return(false)
allow(service).to receive(:execute_hooks)
service.execute(merge_request)
2017-08-17 22:00:37 +05:30
expect(merge_request).to be_open
2016-08-24 12:49:21 +05:30
expect(merge_request.merge_commit_sha).to be_nil
2017-08-17 22:00:37 +05:30
expect(merge_request.merge_error).to include(error_message)
expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
2016-08-24 12:49:21 +05:30
end
2018-03-17 18:26:18 +05:30
2018-11-08 19:23:39 +05:30
context 'when squashing' do
2018-03-17 18:26:18 +05:30
before do
2018-11-08 19:23:39 +05:30
merge_request.update!(source_branch: 'master', target_branch: 'feature')
2018-03-17 18:26:18 +05:30
end
2018-11-08 19:23:39 +05:30
it 'logs and saves error if there is an error when squashing' do
error_message = 'Failed to squash. Should be done manually'
2018-03-17 18:26:18 +05:30
2018-11-08 19:23:39 +05:30
allow_any_instance_of(MergeRequests::SquashService).to receive(:squash).and_return(nil)
merge_request.update(squash: true)
service.execute(merge_request)
expect(merge_request).to be_open
expect(merge_request.merge_commit_sha).to be_nil
expect(merge_request.merge_error).to include(error_message)
expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
end
it 'logs and saves error if there is a squash in progress' do
error_message = 'another squash is already in progress'
allow_any_instance_of(MergeRequest).to receive(:squash_in_progress?).and_return(true)
merge_request.update(squash: true)
service.execute(merge_request)
2018-03-17 18:26:18 +05:30
2018-11-08 19:23:39 +05:30
expect(merge_request).to be_open
expect(merge_request.merge_commit_sha).to be_nil
expect(merge_request.merge_error).to include(error_message)
expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
end
context "when fast-forward merge is not allowed" do
before do
allow_any_instance_of(Repository).to receive(:ancestor?).and_return(nil)
end
%w(semi-linear ff).each do |merge_method|
it "logs and saves error if merge is #{merge_method} only" do
merge_method = 'rebase_merge' if merge_method == 'semi-linear'
merge_request.project.update(merge_method: merge_method)
error_message = 'Only fast-forward merge is allowed for your project. Please update your source branch'
allow(service).to receive(:execute_hooks)
service.execute(merge_request)
expect(merge_request).to be_open
expect(merge_request.merge_commit_sha).to be_nil
expect(merge_request.merge_error).to include(error_message)
expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
end
2018-03-17 18:26:18 +05:30
end
end
end
2015-10-24 18:46:33 +05:30
end
2015-04-26 12:48:37 +05:30
end
end