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

2 files changed, 0 insertions, 24 deletions

diff --git a/spec/services/clusters/applications/create_service_spec.rb b/spec/services/clusters/applications/create_service_spec.rb
index eb907377ca8..00a67a9b2ef 100644
--- a/spec/services/clusters/applications/create_service_spec.rb
+++ b/spec/services/clusters/applications/create_service_spec.rb
@@ -168,29 +168,6 @@ RSpec.describe Clusters::Applications::CreateService do
           subject
         end
       end
-
-      context 'elastic stack application' do
-        let(:params) do
-          {
-            application: 'elastic_stack'
-          }
-        end
-
-        before do
-          create(:clusters_applications_ingress, :installed, external_ip: "127.0.0.0", cluster: cluster)
-          expect_any_instance_of(Clusters::Applications::ElasticStack)
-            .to receive(:make_scheduled!)
-            .and_call_original
-        end
-
-        it 'creates the application' do
-          expect do
-            subject
-
-            cluster.reload
-          end.to change(cluster, :application_elastic_stack)
-        end
-      end
     end
 
     context 'invalid application' do
diff --git a/spec/services/clusters/integrations/create_service_spec.rb b/spec/services/clusters/integrations/create_service_spec.rb
index 6dac97ebf8f..016511a3c01 100644
--- a/spec/services/clusters/integrations/create_service_spec.rb
+++ b/spec/services/clusters/integrations/create_service_spec.rb
@@ -61,7 +61,6 @@ RSpec.describe Clusters::Integrations::CreateService, '#execute' do
   end
 
   it_behaves_like 'a cluster integration', 'prometheus'
-  it_behaves_like 'a cluster integration', 'elastic_stack'
 
   context 'when application_type is invalid' do
     let(:params) do