Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 18 deletions

diff --git a/spec/workers/projects/git_garbage_collect_worker_spec.rb b/spec/workers/projects/git_garbage_collect_worker_spec.rb
index 7daee107a74..259943af2b5 100644
--- a/spec/workers/projects/git_garbage_collect_worker_spec.rb
+++ b/spec/workers/projects/git_garbage_collect_worker_spec.rb
@@ -81,24 +81,6 @@ RSpec.describe Projects::GitGarbageCollectWorker, feature_category: :source_code
 
           expect(project.lfs_objects.reload).to include(lfs_object)
         end
-
-        context 'when feature flag "reorder_garbage_collection_calls" is disabled' do
-          before do
-            stub_feature_flags(reorder_garbage_collection_calls: false)
-          end
-
-          it 'cleans up unreferenced LFS object first' do
-            expect_next_instance_of(Gitlab::Cleanup::OrphanLfsFileReferences) do |svc|
-              expect(svc.project).to eq(project)
-              expect(svc.dry_run).to be_falsy
-              expect(svc).to receive(:run!).and_call_original
-            end
-
-            expect { subject.perform(*params) }.to raise_error('Boom')
-
-            expect(project.lfs_objects.reload).not_to include(lfs_object)
-          end
-        end
       end
 
       it 'catches and logs exceptions' do