Merge branch 'jivanvl-add-multiple-time-series-test' into 'master'

Add tests to cover multiple time series

See merge request gitlab-org/gitlab!25476

spec/frontend/monitoring/components/dashboard_spec.js

@@ -22,7 +22,7 @@ import {
 } from '../mock_data';
 
 const localVue = createLocalVue();
-const expectedPanelCount = 2;
+const expectedPanelCount = 3;
 
 describe('Dashboard', () => {
   let store;

spec/frontend/monitoring/mock_data.js

@@ -513,6 +513,48 @@ export const metricsDashboardPayload = {
             },
           ],
         },
+        {
+          title: 'memories',
+          type: 'area-chart',
+          y_label: 'memories',
+          metrics: [
+            {
+              id: 'metric_of_ages_1000',
+              label: 'memory_1000',
+              unit: 'count',
+              prometheus_endpoint_path: '/root',
+              metric_id: 20,
+            },
+            {
+              id: 'metric_of_ages_1001',
+              label: 'memory_1000',
+              unit: 'count',
+              prometheus_endpoint_path: '/root',
+              metric_id: 21,
+            },
+            {
+              id: 'metric_of_ages_1002',
+              label: 'memory_1000',
+              unit: 'count',
+              prometheus_endpoint_path: '/root',
+              metric_id: 22,
+            },
+            {
+              id: 'metric_of_ages_1003',
+              label: 'memory_1000',
+              unit: 'count',
+              prometheus_endpoint_path: '/root',
+              metric_id: 23,
+            },
+            {
+              id: 'metric_of_ages_1004',
+              label: 'memory_1004',
+              unit: 'count',
+              prometheus_endpoint_path: '/root',
+              metric_id: 24,
+            },
+          ],
+        },
       ],
     },
   ],

spec/frontend/monitoring/store/mutations_spec.js

@@ -50,9 +50,10 @@ describe('Monitoring mutations', () => {
       expect(groups[0].panels).toHaveLength(1);
       expect(groups[0].panels[0].metrics).toHaveLength(1);
 
-      expect(groups[1].panels).toHaveLength(2);
+      expect(groups[1].panels).toHaveLength(3);
       expect(groups[1].panels[0].metrics).toHaveLength(1);
       expect(groups[1].panels[1].metrics).toHaveLength(1);
+      expect(groups[1].panels[2].metrics).toHaveLength(5);
     });
     it('assigns metrics a metric id', () => {
       mutations[types.RECEIVE_METRICS_DATA_SUCCESS](stateCopy, payload);