Commit 140ac8d2 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Add changelog and tests

parent 5f811894
module Projects
module ImportExport
class CleanupService
RESERVED_REFS_NAMES =
%w[heads tags merge-requests keep-around environments]
RESERVED_REFS_REGEXP =
%r{\Arefs/(?:heads|tags|merge\-requests|keep\-around|environments)/}
%r{\Arefs/(?:#{
RESERVED_REFS_NAMES.map(&Regexp.method(:escape)).join('|')})/}x
attr_reader :project
......
---
title: Remove unwanted refs after importing a project
merge_request: 13766
author:
type: other
......@@ -1563,10 +1563,18 @@ def create_pipeline
describe 'project import state transitions' do
context 'state transition: [:started] => [:finished]' do
let(:housekeeping_service) { spy }
let(:cleanup_service) { spy(:cleanup_service) }
let(:housekeeping_service) { spy(:housekeeping_service) }
before do
allow(Projects::HousekeepingService).to receive(:new) { housekeeping_service }
allow(Projects::ImportExport::CleanupService)
.to receive(:new) { cleanup_service }
allow(cleanup_service)
.to receive(:execute) { housekeeping_service.execute }
allow(Projects::HousekeepingService)
.to receive(:new) { housekeeping_service }
end
it 'resets project import_error' do
......@@ -1581,6 +1589,7 @@ def create_pipeline
project.import_finish
expect(cleanup_service).to have_received(:execute)
expect(housekeeping_service).to have_received(:execute)
end
......
......@@ -23,6 +23,12 @@
expect(project.reload.pushes_since_gc).to eq(0)
end
it 'yields the block if given' do
expect do |b|
subject.execute(&b)
end.to yield_with_no_args
end
context 'when no lease can be obtained' do
before do
expect(subject).to receive(:try_obtain_lease).and_return(false)
......@@ -39,6 +45,13 @@
expect { subject.execute }.to raise_error(Projects::HousekeepingService::LeaseTaken)
end.not_to change { project.pushes_since_gc }
end
it 'does not yield' do
expect do |b|
expect { subject.execute(&b) }
.to raise_error(Projects::HousekeepingService::LeaseTaken)
end.not_to yield_with_no_args
end
end
end
......
require 'spec_helper'
describe Projects::ImportExport::CleanupService do
subject { described_class.new(project) }
let(:project) { create(:project, :repository) }
let(:repository) { project.repository }
let(:sha) { project.commit.sha }
let(:housekeeping_service) { double(:housekeeping_service) }
describe '#execute' do
before do
allow(Projects::HousekeepingService)
.to receive(:new).with(project).and_return(housekeeping_service)
allow(housekeeping_service)
.to receive(:execute).and_yield
end
it 'performs housekeeping' do
subject.execute
expect(housekeeping_service).to have_received(:execute)
end
context 'with some refs in refs/pull/**/*' do
before do
repository.write_ref('refs/pull/1/head', sha)
repository.write_ref('refs/pull/1/merge', sha)
subject.execute
end
it 'removes refs/pull/**/*' do
expect(repository.rugged.references.map(&:name))
.not_to include(%r{\Arefs/pull/})
end
end
described_class::RESERVED_REFS_NAMES.each do |name|
context "with a ref in refs/#{name}/tmp" do
before do
repository.write_ref("refs/#{name}/tmp", sha)
subject.execute
end
it "does not remove refs/#{name}/tmp" do
expect(repository.rugged.references.map(&:name))
.to include("refs/#{name}/tmp")
end
end
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment