Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 12 deletions

diff --git a/spec/frontend/monitoring/utils_spec.js b/spec/frontend/monitoring/utils_spec.js
index e78c17dc392..aa5a4459a72 100644
--- a/spec/frontend/monitoring/utils_spec.js
+++ b/spec/frontend/monitoring/utils_spec.js
@@ -315,24 +315,31 @@ describe('monitoring/utils', () => {
     const getUrlParams = url => urlUtils.queryToObject(url.split('?')[1]);
 
     it('returns URL for a panel when query parameters are given', () => {
-      const params = getUrlParams(panelToUrl(dashboard, panelGroup.group, panel));
-
-      expect(params).toEqual({
-        dashboard,
-        group: panelGroup.group,
-        title: panel.title,
-        y_label: panel.y_label,
-      });
+      const params = getUrlParams(panelToUrl(dashboard, {}, panelGroup.group, panel));
+
+      expect(params).toEqual(
+        expect.objectContaining({
+          dashboard,
+          group: panelGroup.group,
+          title: panel.title,
+          y_label: panel.y_label,
+        }),
+      );
     });
 
     it('returns a dashboard only URL if group is missing', () => {
-      const params = getUrlParams(panelToUrl(dashboard, null, panel));
-      expect(params).toEqual({ dashboard: 'metrics.yml' });
+      const params = getUrlParams(panelToUrl(dashboard, {}, null, panel));
+      expect(params).toEqual(expect.objectContaining({ dashboard: 'metrics.yml' }));
     });
 
     it('returns a dashboard only URL if panel is missing', () => {
-      const params = getUrlParams(panelToUrl(dashboard, panelGroup.group, null));
-      expect(params).toEqual({ dashboard: 'metrics.yml' });
+      const params = getUrlParams(panelToUrl(dashboard, {}, panelGroup.group, null));
+      expect(params).toEqual(expect.objectContaining({ dashboard: 'metrics.yml' }));
+    });
+
+    it('returns URL for a panel when query paramters are given including custom variables', () => {
+      const params = getUrlParams(panelToUrl(dashboard, { pod: 'pod' }, panelGroup.group, null));
+      expect(params).toEqual(expect.objectContaining({ dashboard: 'metrics.yml', pod: 'pod' }));
     });
   });