Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
index 793c10f0b21..64f90e44bb6 100644
--- a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
+++ b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
@@ -38,7 +38,7 @@ describe Projects::Environments::PrometheusApiController do
       context 'with success result' do
         let(:service_result) { { status: :success, body: prometheus_body } }
         let(:prometheus_body) { '{"status":"success"}' }
-        let(:prometheus_json_body) { JSON.parse(prometheus_body) }
+        let(:prometheus_json_body) { Gitlab::Json.parse(prometheus_body) }
 
         it 'returns prometheus response' do
           get :proxy, params: environment_params
@@ -55,7 +55,7 @@ describe Projects::Environments::PrometheusApiController do
           end
 
           it 'replaces variables with values' do
-            get :proxy, params: environment_params.merge(query: 'up{environment="%{ci_environment_slug}"}')
+            get :proxy, params: environment_params.merge(query: 'up{environment="{{ci_environment_slug}}"}')
 
             expect(Prometheus::ProxyService).to have_received(:new)
               .with(environment, 'GET', 'query', expected_params)