Merge branch '51972-prometheus-not-showing-as-installed-even-though-it-is' into 'master'

Resolve "Prometheus not showing as installed, even though it is"

Closes #51972

See merge request gitlab-org/gitlab-ce!22356

4 files changed, 8 insertions, 5 deletions

diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index c55953c8d22..1580ef36127 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -4,7 +4,7 @@ describe Clusters::Applications::Ingress do
   let(:ingress) { create(:clusters_applications_ingress) }
 
   include_examples 'cluster application core specs', :clusters_applications_ingress
-  include_examples 'cluster application status specs', :cluster_application_ingress
+  include_examples 'cluster application status specs', :clusters_applications_ingress
 
   before do
     allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
diff --git a/spec/models/clusters/applications/prometheus_spec.rb b/spec/models/clusters/applications/prometheus_spec.rb
index f34b4ece8db..f9776acd4c8 100644
--- a/spec/models/clusters/applications/prometheus_spec.rb
+++ b/spec/models/clusters/applications/prometheus_spec.rb
@@ -4,7 +4,7 @@ describe Clusters::Applications::Prometheus do
   include KubernetesHelpers
 
   include_examples 'cluster application core specs', :clusters_applications_prometheus
-  include_examples 'cluster application status specs', :cluster_application_prometheus
+  include_examples 'cluster application status specs', :clusters_applications_prometheus
 
   describe '.installed' do
     subject { described_class.installed }
diff --git a/spec/models/clusters/applications/runner_spec.rb b/spec/models/clusters/applications/runner_spec.rb
index eda8d519f60..42448b42c8e 100644
--- a/spec/models/clusters/applications/runner_spec.rb
+++ b/spec/models/clusters/applications/runner_spec.rb
@@ -4,7 +4,7 @@ describe Clusters::Applications::Runner do
   let(:ci_runner) { create(:ci_runner) }
 
   include_examples 'cluster application core specs', :clusters_applications_runner
-  include_examples 'cluster application status specs', :cluster_application_runner
+  include_examples 'cluster application status specs', :clusters_applications_runner
 
   it { is_expected.to belong_to(:runner) }
 
diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb
index 2727191eb9b..34d321ec604 100644
--- a/spec/models/clusters/cluster_spec.rb
+++ b/spec/models/clusters/cluster_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Clusters::Cluster do
@@ -15,8 +17,9 @@ describe Clusters::Cluster do
   it { is_expected.to delegate_method(:on_creation?).to(:provider) }
   it { is_expected.to delegate_method(:active?).to(:platform_kubernetes).with_prefix }
   it { is_expected.to delegate_method(:rbac?).to(:platform_kubernetes).with_prefix }
-  it { is_expected.to delegate_method(:installed?).to(:application_helm).with_prefix }
-  it { is_expected.to delegate_method(:installed?).to(:application_ingress).with_prefix }
+  it { is_expected.to delegate_method(:available?).to(:application_helm).with_prefix }
+  it { is_expected.to delegate_method(:available?).to(:application_ingress).with_prefix }
+  it { is_expected.to delegate_method(:available?).to(:application_prometheus).with_prefix }
   it { is_expected.to respond_to :project }
 
   describe '.enabled' do