Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 4 deletions

diff --git a/spec/lib/banzai/filter/inline_grafana_metrics_filter_spec.rb b/spec/lib/banzai/filter/inline_grafana_metrics_filter_spec.rb
index 2092b9e9db8..28bf5bd3e92 100644
--- a/spec/lib/banzai/filter/inline_grafana_metrics_filter_spec.rb
+++ b/spec/lib/banzai/filter/inline_grafana_metrics_filter_spec.rb
@@ -46,11 +46,9 @@ describe Banzai::Filter::InlineGrafanaMetricsFilter do
   end
 
   context 'when "panelId" parameter is missing' do
-    let(:dashboard_path) { '/d/XDaNK6amz/gitlab-omnibus-redis' }
+    let(:dashboard_path) { '/d/XDaNK6amz/gitlab-omnibus-redis?from=1570397739557&to=1570484139557' }
 
-    it 'leaves the markdown unchanged' do
-      expect(unescape(doc.to_s)).to eq(input)
-    end
+    it_behaves_like 'a metrics embed filter'
   end
 
   context 'when time window parameters are missing' do
@@ -86,6 +84,14 @@ describe Banzai::Filter::InlineGrafanaMetricsFilter do
     end
   end
 
+  context 'when no parameters are provided' do
+    let(:dashboard_path) { '/d/XDaNK6amz/gitlab-omnibus-redis' }
+
+    it 'inserts a placeholder' do
+      expect(embed_url).to be_present
+    end
+  end
+
   private
 
   # Nokogiri escapes the URLs, but we don't care about that