e6b5716785
This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee
30 lines
968 B
Ruby
30 lines
968 B
Ruby
require 'spec_helper'
|
|
|
|
describe MergeWorker do
|
|
describe "remove source branch" do
|
|
let!(:merge_request) { create(:merge_request, source_branch: "markdown") }
|
|
let!(:source_project) { merge_request.source_project }
|
|
let!(:project) { merge_request.project }
|
|
let!(:author) { merge_request.author }
|
|
|
|
before do
|
|
source_project.team << [author, :master]
|
|
source_project.repository.expire_branch_names
|
|
end
|
|
|
|
it 'clears cache of source repo after removing source branch' do
|
|
expect(source_project.repository.branch_names).to include('markdown')
|
|
|
|
MergeWorker.new.perform(
|
|
merge_request.id, merge_request.author_id,
|
|
commit_message: 'wow such merge',
|
|
should_remove_source_branch: true)
|
|
|
|
merge_request.reload
|
|
expect(merge_request).to be_merged
|
|
|
|
source_project.repository.expire_branches_cache
|
|
expect(source_project.repository.branch_names).not_to include('markdown')
|
|
end
|
|
end
|
|
end
|