Add latest changes from gitlab-org/gitlab@master

3 files changed, 64 insertions, 12 deletions

diff --git a/spec/workers/batched_git_ref_updates/cleanup_scheduler_worker_spec.rb b/spec/workers/batched_git_ref_updates/cleanup_scheduler_worker_spec.rb
new file mode 100644
index 00000000000..a52043993b7
--- /dev/null
+++ b/spec/workers/batched_git_ref_updates/cleanup_scheduler_worker_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe BatchedGitRefUpdates::CleanupSchedulerWorker, feature_category: :gitaly do
+  let(:stats) { { total_projects: 456 } }
+  let(:service) { instance_double(BatchedGitRefUpdates::CleanupSchedulerService, execute: stats) }
+  let(:worker) { described_class.new }
+
+  describe '#perform' do
+    before do
+      allow(BatchedGitRefUpdates::CleanupSchedulerService).to receive(:new).and_return(service)
+    end
+
+    it 'delegates to CleanupSchedulerService' do
+      expect(service).to receive(:execute)
+
+      worker.perform
+    end
+
+    it 'logs stats' do
+      worker.perform
+
+      expect(worker.logging_extras).to eq({
+        "extra.batched_git_ref_updates_cleanup_scheduler_worker.stats" => { total_projects: 456 }
+      })
+    end
+  end
+
+  it_behaves_like 'an idempotent worker'
+end
diff --git a/spec/workers/batched_git_ref_updates/project_cleanup_worker_spec.rb b/spec/workers/batched_git_ref_updates/project_cleanup_worker_spec.rb
new file mode 100644
index 00000000000..5442b9dd051
--- /dev/null
+++ b/spec/workers/batched_git_ref_updates/project_cleanup_worker_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe BatchedGitRefUpdates::ProjectCleanupWorker, feature_category: :gitaly do
+  let(:stats) { { total_deletes: 456 } }
+  let(:service) { instance_double(BatchedGitRefUpdates::ProjectCleanupService, execute: stats) }
+  let(:worker) { described_class.new }
+
+  describe '#perform' do
+    before do
+      allow(BatchedGitRefUpdates::ProjectCleanupService).to receive(:new).with(123).and_return(service)
+    end
+
+    it 'delegates to ProjectCleanupService' do
+      expect(service).to receive(:execute)
+
+      worker.perform(123)
+    end
+
+    it 'logs stats' do
+      worker.perform(123)
+
+      expect(worker.logging_extras).to eq({
+        "extra.batched_git_ref_updates_project_cleanup_worker.stats" => { total_deletes: 456 }
+      })
+    end
+  end
+
+  it_behaves_like 'an idempotent worker' do
+    let(:job_args) { [123] }
+  end
+end
diff --git a/spec/workers/clusters/agents/notify_git_push_worker_spec.rb b/spec/workers/clusters/agents/notify_git_push_worker_spec.rb
index 561a66b86e9..c6ef8dc3338 100644
--- a/spec/workers/clusters/agents/notify_git_push_worker_spec.rb
+++ b/spec/workers/clusters/agents/notify_git_push_worker_spec.rb
@@ -25,17 +25,5 @@ RSpec.describe Clusters::Agents::NotifyGitPushWorker, feature_category: :deploym
         expect { subject }.not_to raise_error
       end
     end
-
-    context 'when the :notify_kas_on_git_push feature flag is disabled' do
-      before do
-        stub_feature_flags(notify_kas_on_git_push: false)
-      end
-
-      it 'does not notify KAS' do
-        expect(Gitlab::Kas::Client).not_to receive(:new)
-
-        subject
-      end
-    end
   end
 end