Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 5 deletions

diff --git a/spec/frontend/monitoring/embed/embed_spec.js b/spec/frontend/monitoring/embed/embed_spec.js
index c5219f6130e..6d40719fa32 100644
--- a/spec/frontend/monitoring/embed/embed_spec.js
+++ b/spec/frontend/monitoring/embed/embed_spec.js
@@ -1,7 +1,7 @@
 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import Vuex from 'vuex';
 import Embed from '~/monitoring/components/embed.vue';
-import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue';
+import PanelType from 'ee_else_ce/monitoring/components/panel_type.vue';
 import { TEST_HOST } from 'helpers/test_constants';
 import { groups, initialState, metricsData, metricsWithData } from './mock_data';
 
@@ -55,7 +55,7 @@ describe('Embed', () => {
 
     it('shows an empty state when no metrics are present', () => {
       expect(wrapper.find('.metrics-embed').exists()).toBe(true);
-      expect(wrapper.find(MonitorTimeSeriesChart).exists()).toBe(false);
+      expect(wrapper.find(PanelType).exists()).toBe(false);
     });
   });
 
@@ -71,12 +71,12 @@ describe('Embed', () => {
     it('shows a chart when metrics are present', () => {
       wrapper.setProps({});
       expect(wrapper.find('.metrics-embed').exists()).toBe(true);
-      expect(wrapper.find(MonitorTimeSeriesChart).exists()).toBe(true);
-      expect(wrapper.findAll(MonitorTimeSeriesChart).length).toBe(2);
+      expect(wrapper.find(PanelType).exists()).toBe(true);
+      expect(wrapper.findAll(PanelType).length).toBe(2);
     });
 
     it('includes groupId with dashboardUrl', () => {
-      expect(wrapper.find(MonitorTimeSeriesChart).props('groupId')).toBe(TEST_HOST);
+      expect(wrapper.find(PanelType).props('groupId')).toBe(TEST_HOST);
     });
   });
 });
diff --git a/spec/frontend/monitoring/panel_type_spec.js b/spec/frontend/monitoring/panel_type_spec.js
index b30ad747a12..7adecc56d18 100644
--- a/spec/frontend/monitoring/panel_type_spec.js
+++ b/spec/frontend/monitoring/panel_type_spec.js
@@ -102,6 +102,10 @@ describe('Panel Type component', () => {
 
         expect(clipboardText()).toBe(exampleText);
       });
+
+      it('includes a default group id', () => {
+        expect(panelType.vm.groupId).toBe('panel-type-chart');
+      });
     });
 
     describe('Anomaly Chart panel type', () => {