Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 9 deletions

diff --git a/spec/frontend/monitoring/requests/index_spec.js b/spec/frontend/monitoring/requests/index_spec.js
index 03bf5d70153..6f9af911a9f 100644
--- a/spec/frontend/monitoring/requests/index_spec.js
+++ b/spec/frontend/monitoring/requests/index_spec.js
@@ -129,7 +129,7 @@ describe('monitoring metrics_requests', () => {
       });
     });
 
-    test.each`
+    it.each`
       code                                | reason
       ${statusCodes.BAD_REQUEST}          | ${'Parameters are missing or incorrect'}
       ${statusCodes.UNPROCESSABLE_ENTITY} | ${"Expression can't be executed"}
diff --git a/spec/frontend/monitoring/utils_spec.js b/spec/frontend/monitoring/utils_spec.js
index 31975052077..6c6c3d6b90f 100644
--- a/spec/frontend/monitoring/utils_spec.js
+++ b/spec/frontend/monitoring/utils_spec.js
@@ -290,7 +290,7 @@ describe('monitoring/utils', () => {
       expect(() => expandedPanelPayloadFromUrl(metricsDashboardViewModel, search)).toThrow();
     });
 
-    test.each`
+    it.each`
       group            | title            | yLabel             | missingField
       ${'NOT_A_GROUP'} | ${title}         | ${yLabel}          | ${'group'}
       ${group}         | ${'NOT_A_TITLE'} | ${yLabel}          | ${'title'}
@@ -367,7 +367,7 @@ describe('monitoring/utils', () => {
       ],
     };
 
-    [
+    it.each([
       {
         input: { metrics: undefined },
         output: {},
@@ -393,12 +393,10 @@ describe('monitoring/utils', () => {
         output: multipleMetricExpected,
         testCase: 'barChartsDataParser returns multiple series object with multiple metrics',
       },
-    ].forEach(({ input, output, testCase }) => {
-      it(testCase, () => {
-        expect(monitoringUtils.barChartsDataParser(input.metrics)).toEqual(
-          expect.objectContaining(output),
-        );
-      });
+    ])('$testCase', ({ input, output }) => {
+      expect(monitoringUtils.barChartsDataParser(input.metrics)).toEqual(
+        expect.objectContaining(output),
+      );
     });
   });