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

2 files changed, 26 insertions, 12 deletions

diff --git a/spec/lib/gitlab/metrics/dashboard/stages/grafana_formatter_spec.rb b/spec/lib/gitlab/metrics/dashboard/stages/grafana_formatter_spec.rb
index e41004bb57e..5d4bd4512e3 100644
--- a/spec/lib/gitlab/metrics/dashboard/stages/grafana_formatter_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/stages/grafana_formatter_spec.rb
@@ -9,9 +9,9 @@ describe Gitlab::Metrics::Dashboard::Stages::GrafanaFormatter do
   let_it_be(:project) { create(:project, namespace: namespace, name: 'bar') }
 
   describe '#transform!' do
-    let(:grafana_dashboard) { JSON.parse(fixture_file('grafana/simplified_dashboard_response.json'), symbolize_names: true) }
-    let(:datasource) { JSON.parse(fixture_file('grafana/datasource_response.json'), symbolize_names: true) }
-    let(:expected_dashboard) { JSON.parse(fixture_file('grafana/expected_grafana_embed.json'), symbolize_names: true) }
+    let(:grafana_dashboard) { Gitlab::Json.parse(fixture_file('grafana/simplified_dashboard_response.json'), symbolize_names: true) }
+    let(:datasource) { Gitlab::Json.parse(fixture_file('grafana/datasource_response.json'), symbolize_names: true) }
+    let(:expected_dashboard) { Gitlab::Json.parse(fixture_file('grafana/expected_grafana_embed.json'), symbolize_names: true) }
 
     subject(:dashboard) { described_class.new(project, {}, params).transform! }
 
diff --git a/spec/lib/gitlab/metrics/dashboard/url_spec.rb b/spec/lib/gitlab/metrics/dashboard/url_spec.rb
index 9ccd1c06d6b..75f9f99c8a6 100644
--- a/spec/lib/gitlab/metrics/dashboard/url_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/url_spec.rb
@@ -3,17 +3,21 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Dashboard::Url do
+  include Gitlab::Routing.url_helpers
+
   describe '#metrics_regex' do
-    let(:url) do
-      Gitlab::Routing.url_helpers.metrics_namespace_project_environment_url(
+    let(:url_params) do
+      [
         'foo',
         'bar',
         1,
-        start: '2019-08-02T05:43:09.000Z',
-        dashboard: 'config/prometheus/common_metrics.yml',
-        group: 'awesome group',
-        anchor: 'title'
-      )
+        {
+          start: '2019-08-02T05:43:09.000Z',
+          dashboard: 'config/prometheus/common_metrics.yml',
+          group: 'awesome group',
+          anchor: 'title'
+        }
+      ]
     end
 
     let(:expected_params) do
@@ -29,12 +33,22 @@ describe Gitlab::Metrics::Dashboard::Url do
 
     subject { described_class.metrics_regex }
 
-    it_behaves_like 'regex which matches url when expected'
+    context 'for metrics route' do
+      let(:url) { metrics_namespace_project_environment_url(*url_params) }
+
+      it_behaves_like 'regex which matches url when expected'
+    end
+
+    context 'for metrics_dashboard route' do
+      let(:url) { metrics_dashboard_namespace_project_environment_url(*url_params) }
+
+      it_behaves_like 'regex which matches url when expected'
+    end
   end
 
   describe '#grafana_regex' do
     let(:url) do
-      Gitlab::Routing.url_helpers.namespace_project_grafana_api_metrics_dashboard_url(
+      namespace_project_grafana_api_metrics_dashboard_url(
         'foo',
         'bar',
         start: '2019-08-02T05:43:09.000Z',