Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb
index fc9115a5ea1..13089549086 100644
--- a/spec/workers/git_garbage_collect_worker_spec.rb
+++ b/spec/workers/git_garbage_collect_worker_spec.rb
@@ -272,6 +272,11 @@ RSpec.describe GitGarbageCollectWorker do
 
         expect(before_packs.count).to be >= 1
 
+        expect_any_instance_of(Gitlab::GitalyClient::RepositoryService)
+          .to receive(:garbage_collect)
+          .with(bitmaps_enabled, prune: false)
+          .and_call_original
+
         subject.perform(project.id, 'gc', lease_key, lease_uuid)
         after_packed_refs = packed_refs(project)
         after_packs = packs(project)
@@ -292,6 +297,15 @@ RSpec.describe GitGarbageCollectWorker do
 
         subject.perform(project.id, 'gc', lease_key, lease_uuid)
       end
+
+      it 'prune calls garbage_collect with the option prune: true' do
+        expect_any_instance_of(Gitlab::GitalyClient::RepositoryService)
+          .to receive(:garbage_collect)
+          .with(bitmaps_enabled, prune: true)
+          .and_return(nil)
+
+        subject.perform(project.id, 'prune', lease_key, lease_uuid)
+      end
     end
 
     context 'with bitmaps enabled' do