11fd2f80b0
Customers were surprised by the previous behavior, which destroyed branches even though an open merge request existed for it. Closes #29427
67 lines
2.1 KiB
Ruby
67 lines
2.1 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe DeleteMergedBranchesService, services: true do
|
|
subject(:service) { described_class.new(project, project.owner) }
|
|
|
|
let(:project) { create(:project, :repository) }
|
|
|
|
context '#execute' do
|
|
context 'unprotected branches' do
|
|
before do
|
|
service.execute
|
|
end
|
|
|
|
it 'deletes a branch that was merged' do
|
|
expect(project.repository.branch_names).not_to include('improve/awesome')
|
|
end
|
|
|
|
it 'keeps branch that is unmerged' do
|
|
expect(project.repository.branch_names).to include('feature')
|
|
end
|
|
|
|
it 'keeps "master"' do
|
|
expect(project.repository.branch_names).to include('master')
|
|
end
|
|
end
|
|
|
|
context 'protected branches' do
|
|
before do
|
|
create(:protected_branch, name: 'improve/awesome', project: project)
|
|
service.execute
|
|
end
|
|
|
|
it 'keeps protected branch' do
|
|
expect(project.repository.branch_names).to include('improve/awesome')
|
|
end
|
|
end
|
|
|
|
context 'user without rights' do
|
|
let(:user) { create(:user) }
|
|
|
|
it 'cannot execute' do
|
|
expect { described_class.new(project, user).execute }.to raise_error(Gitlab::Access::AccessDeniedError)
|
|
end
|
|
end
|
|
|
|
context 'open merge requests' do
|
|
it 'does not delete branches from open merge requests' do
|
|
fork_link = create(:forked_project_link, forked_from_project: project)
|
|
create(:merge_request, :reopened, source_project: project, target_project: project, source_branch: 'branch-merged', target_branch: 'master')
|
|
create(:merge_request, :opened, source_project: fork_link.forked_to_project, target_project: project, target_branch: 'improve/awesome', source_branch: 'master')
|
|
|
|
service.execute
|
|
|
|
expect(project.repository.branch_names).to include('branch-merged')
|
|
expect(project.repository.branch_names).to include('improve/awesome')
|
|
end
|
|
end
|
|
end
|
|
|
|
context '#async_execute' do
|
|
it 'calls DeleteMergedBranchesWorker async' do
|
|
expect(DeleteMergedBranchesWorker).to receive(:perform_async)
|
|
|
|
service.async_execute
|
|
end
|
|
end
|
|
end
|