Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 26 deletions

diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb
deleted file mode 100644
index 3df64c35166..00000000000
--- a/spec/workers/git_garbage_collect_worker_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'fileutils'
-
-require 'spec_helper'
-
-RSpec.describe GitGarbageCollectWorker do
-  let_it_be(:project) { create(:project, :repository) }
-
-  let(:lease_uuid) { SecureRandom.uuid }
-  let(:lease_key)  { "project_housekeeping:#{project.id}" }
-  let(:task)       { :full_repack }
-  let(:params)     { [project.id, task, lease_key, lease_uuid] }
-
-  subject { described_class.new }
-
-  describe "#perform" do
-    it 'calls the Projects::GitGarbageGitGarbageCollectWorker with the same params' do
-      expect_next_instance_of(Projects::GitGarbageCollectWorker) do |instance|
-        expect(instance).to receive(:perform).with(*params)
-      end
-
-      subject.perform(*params)
-    end
-  end
-end
diff --git a/spec/workers/pipeline_process_worker_spec.rb b/spec/workers/pipeline_process_worker_spec.rb
index 5d45a131095..0c1db3ccc5a 100644
--- a/spec/workers/pipeline_process_worker_spec.rb
+++ b/spec/workers/pipeline_process_worker_spec.rb
@@ -20,5 +20,10 @@ RSpec.describe PipelineProcessWorker do
           .not_to raise_error
       end
     end
+
+    it_behaves_like 'worker with data consistency',
+                described_class,
+                feature_flag: :load_balancing_for_pipeline_process_worker,
+                data_consistency: :delayed
   end
 end