Merge pull request #597 from w3c/metrics-fix

Fix Test Database Seeder to Support TestPlanReport Metrics
w3c · Apr 10, 2023 · 232e26b · 232e26b
2 parents 5a5fb3a + 70bb8bb
commit 232e26b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/server/resolvers/TestPlanRunOperations/findOrCreateTestResultResolver.js b/server/resolvers/TestPlanRunOperations/findOrCreateTestResultResolver.js
@@ -5,12 +5,38 @@ const {
 const populateData = require('../../services/PopulatedData/populateData');
 const sortArrayLikeArray = require('../../util/sortArrayLikeArray');
 const createTestResultSkeleton = require('./createTestResultSkeleton');
+const getMetrics = require('../../util/getMetrics');
+const {
+    updateTestPlanReport
+} = require('../../models/services/TestPlanReportService');
+const runnableTestsResolver = require('../TestPlanReport/runnableTestsResolver');
+const finalizedTestResultsResolver = require('../TestPlanReport/finalizedTestResultsResolver');
 
 const findOrCreateTestResultResolver = async (
     { parentContext: { id: testPlanRunId } },
     { testId, atVersionId, browserVersionId },
     { user }
 ) => {
+    const fixTestPlanReportMetrics = async testPlanReportStale => {
+        const { testPlanReport } = await populateData({
+            testPlanReportId: testPlanReportStale.id
+        });
+        const runnableTests = runnableTestsResolver(testPlanReport);
+        const finalizedTestResults = finalizedTestResultsResolver({
+            ...testPlanReport
+        });
+        const metrics = getMetrics({
+            testPlanReport: {
+                ...testPlanReport,
+                finalizedTestResults,
+                runnableTests
+            }
+        });
+        await updateTestPlanReport(testPlanReport.id, {
+            metrics: { ...testPlanReport.metrics, ...metrics }
+        });
+    };
+
     const {
         testPlanRun,
         testPlanReport,
@@ -66,6 +92,7 @@ const findOrCreateTestResultResolver = async (
         await updateTestPlanRun(testPlanRun.id, {
             testResults: newTestResults
         });
+        await fixTestPlanReportMetrics(testPlanReport);
     } else {
         // atVersionId and browserVersionId update
         const testResultIndex = testPlanRun.testResults.findIndex(
@@ -79,6 +106,7 @@ const findOrCreateTestResultResolver = async (
         await updateTestPlanRun(testPlanRun.id, {
             testResults: newTestResults
         });
+        await fixTestPlanReportMetrics(testPlanReport);
     }
 
     return populateData({ testResultId: newTestResult.id });

diff --git a/server/tests/integration/embed.test.js b/server/tests/integration/embed.test.js
@@ -57,9 +57,7 @@ describe('embed', () => {
         const copyEmbedButtonOnClick = copyEmbedButton.getAttribute('onclick');
         const table = document.querySelector('table');
         const cellWithData = Array.from(table.querySelectorAll('td')).find(td =>
-            // TODO: change check to \d+ instead of \d* as soon as the missing
-            // number issue is fixed
-            td.innerHTML.match(/<b>\s*\d*%\s*<\/b>\s*supported/)
+            td.innerHTML.match(/<b>\s*\d+%\s*<\/b>\s*supported/)
         );
 
         expect(res.text).toEqual(res2.text);