Add latest changes from gitlab-org/gitlab@master

2 files changed, 73 insertions, 23 deletions

diff --git a/spec/lib/gitlab/metrics/dashboard/service_selector_spec.rb b/spec/lib/gitlab/metrics/dashboard/service_selector_spec.rb
index 095d0a2df78..0d4562f78f1 100644
--- a/spec/lib/gitlab/metrics/dashboard/service_selector_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/service_selector_spec.rb
@@ -75,6 +75,17 @@ describe Gitlab::Metrics::Dashboard::ServiceSelector do
 
         it { is_expected.to be Metrics::Dashboard::CustomMetricEmbedService }
       end
+
+      context 'with a grafana link' do
+        let(:arguments) do
+          {
+            embedded: true,
+            grafana_url: 'https://grafana.example.com'
+          }
+        end
+
+        it { is_expected.to be Metrics::Dashboard::GrafanaMetricEmbedService }
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/metrics/dashboard/url_spec.rb b/spec/lib/gitlab/metrics/dashboard/url_spec.rb
index e0dc6d98efc..daaf66cba46 100644
--- a/spec/lib/gitlab/metrics/dashboard/url_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/url_spec.rb
@@ -3,13 +3,41 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Dashboard::Url do
-  describe '#regex' do
-    it 'returns a regular expression' do
-      expect(described_class.regex).to be_a Regexp
-    end
+  shared_examples_for 'a regex which matches the expected url' do
+    it { is_expected.to be_a Regexp }
 
     it 'matches a metrics dashboard link with named params' do
-      url = Gitlab::Routing.url_helpers.metrics_namespace_project_environment_url(
+      expect(subject).to match url
+
+      subject.match(url) do |m|
+        expect(m.named_captures).to eq expected_params
+      end
+    end
+  end
+
+  shared_examples_for 'does not match non-matching urls' do
+    it 'does not match other gitlab urls that contain the term metrics' do
+      url = Gitlab::Routing.url_helpers.active_common_namespace_project_prometheus_metrics_url('foo', 'bar', :json)
+
+      expect(subject).not_to match url
+    end
+
+    it 'does not match other gitlab urls' do
+      url = Gitlab.config.gitlab.url
+
+      expect(subject).not_to match url
+    end
+
+    it 'does not match non-gitlab urls' do
+      url = 'https://www.super_awesome_site.com/'
+
+      expect(subject).not_to match url
+    end
+  end
+
+  describe '#regex' do
+    let(:url) do
+      Gitlab::Routing.url_helpers.metrics_namespace_project_environment_url(
         'foo',
         'bar',
         1,
@@ -18,8 +46,10 @@ describe Gitlab::Metrics::Dashboard::Url do
         group: 'awesome group',
         anchor: 'title'
       )
+    end
 
-      expected_params = {
+    let(:expected_params) do
+      {
         'url' => url,
         'namespace' => 'foo',
         'project' => 'bar',
@@ -27,31 +57,40 @@ describe Gitlab::Metrics::Dashboard::Url do
         'query' => '?dashboard=config%2Fprometheus%2Fcommon_metrics.yml&group=awesome+group&start=2019-08-02T05%3A43%3A09.000Z',
         'anchor' => '#title'
       }
-
-      expect(described_class.regex).to match url
-
-      described_class.regex.match(url) do |m|
-        expect(m.named_captures).to eq expected_params
-      end
     end
 
-    it 'does not match other gitlab urls that contain the term metrics' do
-      url = Gitlab::Routing.url_helpers.active_common_namespace_project_prometheus_metrics_url('foo', 'bar', :json)
+    subject { described_class.regex }
 
-      expect(described_class.regex).not_to match url
-    end
+    it_behaves_like 'a regex which matches the expected url'
+    it_behaves_like 'does not match non-matching urls'
+  end
 
-    it 'does not match other gitlab urls' do
-      url = Gitlab.config.gitlab.url
+  describe '#grafana_regex' do
+    let(:url) do
+      Gitlab::Routing.url_helpers.namespace_project_grafana_api_metrics_dashboard_url(
+        'foo',
+        'bar',
+        start: '2019-08-02T05:43:09.000Z',
+        dashboard: 'config/prometheus/common_metrics.yml',
+        group: 'awesome group',
+        anchor: 'title'
+      )
+    end
 
-      expect(described_class.regex).not_to match url
+    let(:expected_params) do
+      {
+        'url' => url,
+        'namespace' => 'foo',
+        'project' => 'bar',
+        'query' => '?dashboard=config%2Fprometheus%2Fcommon_metrics.yml&group=awesome+group&start=2019-08-02T05%3A43%3A09.000Z',
+        'anchor' => '#title'
+      }
     end
 
-    it 'does not match non-gitlab urls' do
-      url = 'https://www.super_awesome_site.com/'
+    subject { described_class.grafana_regex }
 
-      expect(described_class.regex).not_to match url
-    end
+    it_behaves_like 'a regex which matches the expected url'
+    it_behaves_like 'does not match non-matching urls'
   end
 
   describe '#build_dashboard_url' do