Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 6 deletions

diff --git a/spec/models/deployment_metrics_spec.rb b/spec/models/deployment_metrics_spec.rb
index 7c574a8b6c8..32c04e15b73 100644
--- a/spec/models/deployment_metrics_spec.rb
+++ b/spec/models/deployment_metrics_spec.rb
@@ -20,7 +20,7 @@ describe DeploymentMetrics do
       end
 
       context 'with a Prometheus Service' do
-        let(:prometheus_service) { instance_double(PrometheusService, can_query?: true) }
+        let(:prometheus_service) { instance_double(PrometheusService, can_query?: true, configured?: true) }
 
         before do
           allow(deployment.project).to receive(:find_or_initialize_service).with('prometheus').and_return prometheus_service
@@ -30,7 +30,17 @@ describe DeploymentMetrics do
       end
 
       context 'with a Prometheus Service that cannot query' do
-        let(:prometheus_service) { instance_double(PrometheusService, can_query?: false) }
+        let(:prometheus_service) { instance_double(PrometheusService, configured?: true, can_query?: false) }
+
+        before do
+          allow(deployment.project).to receive(:find_or_initialize_service).with('prometheus').and_return prometheus_service
+        end
+
+        it { is_expected.to be_falsy }
+      end
+
+      context 'with a Prometheus Service that is not configured' do
+        let(:prometheus_service) { instance_double(PrometheusService, configured?: false, can_query?: false) }
 
         before do
           allow(deployment.project).to receive(:find_or_initialize_service).with('prometheus').and_return prometheus_service
@@ -44,7 +54,7 @@ describe DeploymentMetrics do
         let!(:prometheus) { create(:clusters_applications_prometheus, :installed, cluster: deployment.cluster) }
 
         before do
-          expect(deployment.cluster.application_prometheus).to receive(:can_query?).and_return(true)
+          expect(deployment.cluster.application_prometheus).to receive(:configured?).and_return(true)
         end
 
         it { is_expected.to be_truthy }
@@ -54,7 +64,7 @@ describe DeploymentMetrics do
 
   describe '#metrics' do
     let(:deployment) { create(:deployment, :success) }
-    let(:prometheus_adapter) { instance_double(PrometheusService, can_query?: true) }
+    let(:prometheus_adapter) { instance_double(PrometheusService, can_query?: true, configured?: true) }
     let(:deployment_metrics) { described_class.new(deployment.project, deployment) }
 
     subject { deployment_metrics.metrics }
@@ -101,7 +111,7 @@ describe DeploymentMetrics do
         }
       end
 
-      let(:prometheus_adapter) { instance_double('prometheus_adapter', can_query?: true) }
+      let(:prometheus_adapter) { instance_double('prometheus_adapter', can_query?: true, configured?: true) }
 
       before do
         allow(deployment_metrics).to receive(:prometheus_adapter).and_return(prometheus_adapter)
diff --git a/spec/serializers/environment_status_entity_spec.rb b/spec/serializers/environment_status_entity_spec.rb
index 6d98f91cfde..11455c57677 100644
--- a/spec/serializers/environment_status_entity_spec.rb
+++ b/spec/serializers/environment_status_entity_spec.rb
@@ -45,7 +45,7 @@ describe EnvironmentStatusEntity do
   end
 
   context 'when deployment has metrics' do
-    let(:prometheus_adapter) { double('prometheus_adapter', can_query?: true) }
+    let(:prometheus_adapter) { double('prometheus_adapter', can_query?: true, configured?: true) }
 
     let(:simple_metrics) do
       {