require 'spec_helper' describe MergeRequests::SquashService do let(:service) { described_class.new(project, user, {}) } let(:user) { project.owner } let(:project) { create(:project, :repository) } let(:repository) { project.repository.raw } let(:log_error) { "Failed to squash merge request #{merge_request.to_reference(full: true)}:" } let(:squash_dir_path) do File.join(Gitlab.config.shared.path, 'tmp/squash', repository.gl_repository, merge_request.id.to_s) end let(:merge_request_with_one_commit) do create(:merge_request, source_branch: 'feature', source_project: project, target_branch: 'master', target_project: project) end let(:merge_request_with_only_new_files) do create(:merge_request, source_branch: 'video', source_project: project, target_branch: 'master', target_project: project) end let(:merge_request_with_large_files) do create(:merge_request, source_branch: 'squash-large-files', source_project: project, target_branch: 'master', target_project: project) end shared_examples 'the squash succeeds' do it 'returns the squashed commit SHA' do result = service.execute(merge_request) expect(result).to match(status: :success, squash_sha: a_string_matching(/\h{40}/)) expect(result[:squash_sha]).not_to eq(merge_request.diff_head_sha) end it 'cleans up the temporary directory' do service.execute(merge_request) expect(File.exist?(squash_dir_path)).to be(false) end it 'does not keep the branch push event' do expect { service.execute(merge_request) }.not_to change { Event.count } end context 'the squashed commit' do let(:squash_sha) { service.execute(merge_request)[:squash_sha] } let(:squash_commit) { project.repository.commit(squash_sha) } it 'copies the author info and message from the merge request' do expect(squash_commit.author_name).to eq(merge_request.author.name) expect(squash_commit.author_email).to eq(merge_request.author.email) # Commit messages have a trailing newline, but titles don't. expect(squash_commit.message.chomp).to eq(merge_request.title) end it 'sets the current user as the committer' do expect(squash_commit.committer_name).to eq(user.name.chomp('.')) expect(squash_commit.committer_email).to eq(user.email) end it 'has the same diff as the merge request, but a different SHA' do rugged = Gitlab::GitalyClient::StorageSettings.allow_disk_access do project.repository.rugged end mr_diff = rugged.diff(merge_request.diff_base_sha, merge_request.diff_head_sha) squash_diff = rugged.diff(merge_request.diff_start_sha, squash_sha) expect(squash_diff.patch.length).to eq(mr_diff.patch.length) expect(squash_commit.sha).not_to eq(merge_request.diff_head_sha) end end end describe '#execute' do context 'when there is only one commit in the merge request' do it 'returns that commit SHA' do result = service.execute(merge_request_with_one_commit) expect(result).to match(status: :success, squash_sha: merge_request_with_one_commit.diff_head_sha) end it 'does not perform any git actions' do expect(repository).not_to receive(:popen) service.execute(merge_request_with_one_commit) end end context 'when squashing only new files' do let(:merge_request) { merge_request_with_only_new_files } include_examples 'the squash succeeds' end context 'when squashing with files too large to display' do let(:merge_request) { merge_request_with_large_files } include_examples 'the squash succeeds' end context 'git errors' do let(:merge_request) { merge_request_with_only_new_files } let(:error) { 'A test error' } context 'with gitaly enabled' do before do allow(repository.gitaly_operation_client).to receive(:user_squash) .and_raise(Gitlab::Git::Repository::GitError, error) end it 'logs the stage and output' do expect(service).to receive(:log_error).with(log_error) expect(service).to receive(:log_error).with(error) service.execute(merge_request) end it 'returns an error' do expect(service.execute(merge_request)).to match(status: :error, message: a_string_including('squash')) end end end context 'when any other exception is thrown' do let(:merge_request) { merge_request_with_only_new_files } let(:error) { 'A test error' } before do allow(merge_request).to receive(:commits_count).and_raise(error) end it 'logs the MR reference and exception' do expect(service).to receive(:log_error).with(a_string_including("#{project.full_path}#{merge_request.to_reference}")) expect(service).to receive(:log_error).with(error) service.execute(merge_request) end it 'returns an error' do expect(service.execute(merge_request)).to match(status: :error, message: a_string_including('squash')) end it 'cleans up the temporary directory' do service.execute(merge_request) expect(File.exist?(squash_dir_path)).to be(false) end end end end