Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/models/concerns/prometheus_adapter_spec.rb b/spec/models/concerns/prometheus_adapter_spec.rb
index 01c987a1d92..4158e8a0a4c 100644
--- a/spec/models/concerns/prometheus_adapter_spec.rb
+++ b/spec/models/concerns/prometheus_adapter_spec.rb
@@ -165,6 +165,14 @@ RSpec.describe PrometheusAdapter, :use_clean_rails_memory_store_caching do
         it { is_expected.to eq(success: false, result: %(#{status} - "QUERY FAILED!")) }
       end
     end
+
+    context "when client raises Gitlab::PrometheusClient::ConnectionError" do
+      before do
+        stub_any_prometheus_request.to_raise(Gitlab::PrometheusClient::ConnectionError)
+      end
+
+      it { is_expected.to include(success: false, result: kind_of(String)) }
+    end
   end
 
   describe '#build_query_args' do