Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

2 files changed, 0 insertions, 45 deletions

diff --git a/spec/models/clusters/integrations/elastic_stack_spec.rb b/spec/models/clusters/integrations/elastic_stack_spec.rb
deleted file mode 100644
index be4d59b52a2..00000000000
--- a/spec/models/clusters/integrations/elastic_stack_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Clusters::Integrations::ElasticStack do
-  include KubernetesHelpers
-  include StubRequests
-
-  describe 'associations' do
-    it { is_expected.to belong_to(:cluster).class_name('Clusters::Cluster') }
-  end
-
-  describe 'validations' do
-    it { is_expected.to validate_presence_of(:cluster) }
-    it { is_expected.not_to allow_value(nil).for(:enabled) }
-  end
-
-  it_behaves_like 'cluster-based #elasticsearch_client', :clusters_integrations_elastic_stack
-end
diff --git a/spec/models/clusters/integrations/prometheus_spec.rb b/spec/models/clusters/integrations/prometheus_spec.rb
index d1e40fffee0..90e99aefdce 100644
--- a/spec/models/clusters/integrations/prometheus_spec.rb
+++ b/spec/models/clusters/integrations/prometheus_spec.rb
@@ -26,19 +26,6 @@ RSpec.describe Clusters::Integrations::Prometheus do
 
       integration.destroy!
     end
-
-    context 'when the FF :rename_integrations_workers is disabled' do
-      before do
-        stub_feature_flags(rename_integrations_workers: false)
-      end
-
-      it 'uses the old worker' do
-        expect(Clusters::Applications::DeactivateServiceWorker)
-          .to receive(:perform_async).with(cluster.id, 'prometheus')
-
-        integration.destroy!
-      end
-    end
   end
 
   describe 'after_save' do
@@ -70,19 +57,6 @@ RSpec.describe Clusters::Integrations::Prometheus do
 
         integration.update!(enabled: true)
       end
-
-      context 'when the FF :rename_integrations_workers is disabled' do
-        before do
-          stub_feature_flags(rename_integrations_workers: false)
-        end
-
-        it 'uses the old worker' do
-          expect(Clusters::Applications::ActivateServiceWorker)
-            .to receive(:perform_async).with(cluster.id, 'prometheus')
-
-          integration.update!(enabled: true)
-        end
-      end
     end
 
     context 'when disabling' do