Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/lib/gitlab/prometheus/adapter_spec.rb b/spec/lib/gitlab/prometheus/adapter_spec.rb
index 202bf65f92b..afee95467fa 100644
--- a/spec/lib/gitlab/prometheus/adapter_spec.rb
+++ b/spec/lib/gitlab/prometheus/adapter_spec.rb
@@ -19,6 +19,14 @@ describe Gitlab::Prometheus::Adapter do
       it 'return prometheus service as prometheus adapter' do
         expect(subject.prometheus_adapter).to eq(prometheus_service)
       end
+
+      context 'with cluster with prometheus available' do
+        let!(:prometheus) { create(:clusters_applications_prometheus, :installed, cluster: cluster) }
+
+        it 'returns prometheus service' do
+          expect(subject.prometheus_adapter).to eq(prometheus_service)
+        end
+      end
     end
 
     context "prometheus service can't execute queries" do