Add latest changes from gitlab-org/gitlab@master

2 files changed, 49 insertions, 0 deletions

diff --git a/spec/workers/clusters/agents/delete_expired_events_worker_spec.rb b/spec/workers/clusters/agents/delete_expired_events_worker_spec.rb
new file mode 100644
index 00000000000..1a5ca744091
--- /dev/null
+++ b/spec/workers/clusters/agents/delete_expired_events_worker_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Clusters::Agents::DeleteExpiredEventsWorker do
+  let(:agent) { create(:cluster_agent) }
+
+  describe '#perform' do
+    let(:agent_id) { agent.id }
+    let(:deletion_service) { double(execute: true) }
+
+    subject { described_class.new.perform(agent_id) }
+
+    it 'calls the deletion service' do
+      expect(deletion_service).to receive(:execute).once
+      expect(Clusters::Agents::DeleteExpiredEventsService).to receive(:new)
+        .with(agent).and_return(deletion_service)
+
+      subject
+    end
+
+    context 'agent no longer exists' do
+      let(:agent_id) { -1 }
+
+      it 'completes without raising an error' do
+        expect { subject }.not_to raise_error
+      end
+    end
+  end
+end
diff --git a/spec/workers/concerns/cluster_agent_queue_spec.rb b/spec/workers/concerns/cluster_agent_queue_spec.rb
new file mode 100644
index 00000000000..b5189cbd8c8
--- /dev/null
+++ b/spec/workers/concerns/cluster_agent_queue_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ClusterAgentQueue do
+  let(:worker) do
+    Class.new do
+      def self.name
+        'ExampleWorker'
+      end
+
+      include ApplicationWorker
+      include ClusterAgentQueue
+    end
+  end
+
+  it { expect(worker.queue).to eq('cluster_agent:example') }
+  it { expect(worker.get_feature_category).to eq(:kubernetes_management) }
+end