Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 43 deletions

diff --git a/spec/workers/external_service_reactive_caching_worker_spec.rb b/spec/workers/external_service_reactive_caching_worker_spec.rb
new file mode 100644
index 00000000000..45cce71b75b
--- /dev/null
+++ b/spec/workers/external_service_reactive_caching_worker_spec.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ExternalServiceReactiveCachingWorker do
+  it_behaves_like 'reactive cacheable worker'
+end
diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb
index 603ce6160ce..dcb804a7e6e 100644
--- a/spec/workers/reactive_caching_worker_spec.rb
+++ b/spec/workers/reactive_caching_worker_spec.rb
@@ -3,47 +3,5 @@
 require 'spec_helper'
 
 describe ReactiveCachingWorker do
-  describe '#perform' do
-    context 'when user configured kubernetes from CI/CD > Clusters' do
-      let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
-      let(:project) { cluster.project }
-      let!(:environment) { create(:environment, project: project) }
-
-      it 'calls #exclusively_update_reactive_cache!' do
-        expect_any_instance_of(Environment).to receive(:exclusively_update_reactive_cache!)
-
-        described_class.new.perform("Environment", environment.id)
-      end
-
-      context 'when ReactiveCaching::ExceededReactiveCacheLimit is raised' do
-        it 'avoids failing the job and tracks via Gitlab::ErrorTracking' do
-          allow_any_instance_of(Environment).to receive(:exclusively_update_reactive_cache!)
-            .and_raise(ReactiveCaching::ExceededReactiveCacheLimit)
-
-          expect(Gitlab::ErrorTracking).to receive(:track_exception)
-            .with(kind_of(ReactiveCaching::ExceededReactiveCacheLimit))
-
-          described_class.new.perform("Environment", environment.id)
-        end
-      end
-    end
-  end
-
-  describe 'worker context' do
-    it 'sets the related class on the job' do
-      described_class.perform_async('Environment', 1, 'other', 'argument')
-
-      scheduled_job = described_class.jobs.first
-
-      expect(scheduled_job).to include('meta.related_class' => 'Environment')
-    end
-
-    it 'sets the related class on the job when it was passed as a class' do
-      described_class.perform_async(Project, 1, 'other', 'argument')
-
-      scheduled_job = described_class.jobs.first
-
-      expect(scheduled_job).to include('meta.related_class' => 'Project')
-    end
-  end
+  it_behaves_like 'reactive cacheable worker'
 end