6ef87a2083
Having two states that essentially mean the same thing is very much like
having a boolean "true" and boolean "mostly-true": it's rather silly.
This commit merges the "reopened" state into the "opened" state while
taking care of system notes still showing messages along the lines of
"Alice reopened this issue".
A big benefit from having only two states (opened and closed) is that
indexing and querying becomes simpler and more performant. For example,
to get all the opened queries we no longer have to query both states:
SELECT *
FROM issues
WHERE project_id = 2
AND state IN ('opened', 'reopened');
Instead we can query a single state directly, which can be much faster:
SELECT *
FROM issues
WHERE project_id = 2
AND state = 'opened';
Further, only having two states makes indexing easier as we will only
ever filter (and thus scan an index) using a single value. Partial
indexes could help but aren't supported on MySQL, complicating the
development process and not being helpful for MySQL.
64 lines
1.9 KiB
Ruby
64 lines
1.9 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe DeleteMergedBranchesService do
|
|
subject(:service) { described_class.new(project, project.owner) }
|
|
|
|
let(:project) { create(:project, :repository) }
|
|
|
|
context '#execute' do
|
|
it 'deletes a branch that was merged' do
|
|
service.execute
|
|
|
|
expect(project.repository.branch_names).not_to include('improve/awesome')
|
|
end
|
|
|
|
it 'keeps branch that is unmerged' do
|
|
service.execute
|
|
|
|
expect(project.repository.branch_names).to include('feature')
|
|
end
|
|
|
|
it 'keeps "master"' do
|
|
service.execute
|
|
|
|
expect(project.repository.branch_names).to include('master')
|
|
end
|
|
|
|
it 'keeps protected branches' do
|
|
create(:protected_branch, project: project, name: 'improve/awesome')
|
|
|
|
service.execute
|
|
|
|
expect(project.repository.branch_names).to include('improve/awesome')
|
|
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, :opened, 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
|