Merge pull request #1178 from w3c/development

howard-e · web-flow · commit 1812f84483a9 · 2024-07-29T10:35:59.000-04:00
Create July 29, Release Includes the following changes: * #1172, to address #1173 and #1174 * #1170, to address #1171
diff --git a/client/components/AddTestToQueueWithConfirmation/index.jsx b/client/components/AddTestToQueueWithConfirmation/index.jsx
@@ -166,7 +166,8 @@ function AddTestToQueueWithConfirmation({
           } catch (e) {
             console.error(e);
           }
-        }
+        },
+        testId: 'add-run-later'
       });
 
       if (!alreadyHasBotInTestPlanReport) {
@@ -186,7 +187,8 @@ function AddTestToQueueWithConfirmation({
             } catch (e) {
               console.error(e);
             }
-          }
+          },
+          testId: 'add-run-bot'
         });
       }
     }
diff --git a/client/components/CandidateReview/TestPlans/index.jsx b/client/components/CandidateReview/TestPlans/index.jsx
@@ -20,6 +20,7 @@ import {
 import ClippedProgressBar from '@components/common/ClippedProgressBar';
 import { convertDateToString } from '@client/utils/formatter';
 import './TestPlans.css';
+import { calculations } from 'shared';
 
 const FullHeightContainer = styled(Container)`
   min-height: calc(100vh - 64px);
@@ -486,13 +487,12 @@ const TestPlans = ({ testPlanVersions }) => {
                         obj.mustAssertionsFailedCount,
                       0
                     ),
-                    totalSupportPercent:
-                      Math.round(
-                        allMetrics.reduce(
-                          (acc, obj) => acc + obj.supportPercent,
-                          0
-                        ) / allMetrics.length
-                      ) || 0
+                    totalSupportPercent: calculations.trimDecimals(
+                      allMetrics.reduce(
+                        (acc, obj) => acc + obj.supportPercent,
+                        0
+                      ) / allMetrics.length
+                    )
                   };
 
                   // Make sure issues are unique
@@ -550,10 +550,10 @@ const TestPlans = ({ testPlanVersions }) => {
                         <CenteredTd>
                           <Link
                             to={`/candidate-test-plan/${testPlanVersion.id}/${atId}`}
+                            aria-label={`${metrics.totalSupportPercent}%`}
                           >
                             <ClippedProgressBar
                               progress={metrics.totalSupportPercent}
-                              label={`${metrics.totalSupportPercent}% completed`}
                               clipped
                             />
                           </Link>
diff --git a/client/components/Reports/SummarizeTestPlanReports.jsx b/client/components/Reports/SummarizeTestPlanReports.jsx
@@ -132,12 +132,10 @@ const SummarizeTestPlanReports = ({ testPlanVersions }) => {
                             `/report/${testPlanVersion.id}` +
                             `/targets/${testPlanReport.id}`
                           }
+                          aria-label={`${metrics.supportPercent}%`}
                         >
                           <ClippedProgressBar
                             progress={metrics.supportPercent}
-                            label={`${getTestPlanTargetTitle(
-                              testPlanTarget
-                            )}, ${metrics.supportPercent}% completed`}
                           />
                         </Link>
                       </td>
diff --git a/client/components/common/BasicModal/index.jsx b/client/components/common/BasicModal/index.jsx
@@ -61,6 +61,7 @@ const BasicModal = ({
           variant={action.variant ?? 'primary'}
           onClick={action.onClick}
           className={action.className ?? ''}
+          data-testid={action.testId ?? ''}
         >
           {action.label ?? 'Continue'}
         </Button>
@@ -138,6 +139,7 @@ BasicModal.propTypes = {
       onClick: PropTypes.func,
       variant: PropTypes.string,
       className: PropTypes.string,
+      testId: PropTypes.string,
       component: PropTypes.elementType,
       props: PropTypes.object
     })
diff --git a/client/components/common/ClippedProgressBar/index.jsx b/client/components/common/ClippedProgressBar/index.jsx
@@ -2,16 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './ClippedProgressBar.css';
 
-const ProgressBar = ({
-  progress = 0,
-  label = '',
-  clipped = true,
-  decorative
-}) => {
+const ProgressBar = ({ progress = 0, clipped = true, decorative }) => {
   return (
     <>
       {clipped ? (
-        <div className="progress clipped" aria-label={label}>
+        <div className="progress clipped">
           <div
             className="front"
             style={{
@@ -23,7 +18,7 @@ const ProgressBar = ({
           <div className="back">{decorative ? null : `${progress}%`}</div>
         </div>
       ) : (
-        <div className="progress" aria-label={label}>
+        <div className="progress">
           <div
             className="progress-bar bg-info"
             style={{
@@ -40,7 +35,6 @@ const ProgressBar = ({
 
 ProgressBar.propTypes = {
   progress: PropTypes.number,
-  label: PropTypes.string,
   clipped: PropTypes.bool,
   decorative: PropTypes.bool
 };
diff --git a/client/tests/AddTestToQueueWithConfirmation.test.jsx b/client/tests/AddTestToQueueWithConfirmation.test.jsx
@@ -111,6 +111,7 @@ describe('AddTestToQueueWithConfirmation', () => {
 
   test('calls mutation on button click with correct variables', async () => {
     fireEvent.click(getByTestId('add-button'));
+    fireEvent.click(await getByTestId('add-run-later'));
 
     await waitFor(() => {
       expect(mutationMock).toHaveBeenCalled();
diff --git a/client/utils/automation.js b/client/utils/automation.js
@@ -19,10 +19,13 @@ export const isSupportedByResponseCollector = ctx => {
   // Check if the AT and browser are supported by the automation
   const isNvdaWithSupportedBrowser =
     atKey === 'nvda' && (browserKey === 'chrome' || browserKey === 'firefox');
-  const isVoiceOverMacWithSafari =
-    atKey === 'voiceover_macos' && browserKey === 'safari_macos';
+  const isVoiceOverMacWithSupportedBrowser =
+    atKey === 'voiceover_macos' &&
+    (browserKey === 'safari_macos' ||
+      browserKey === 'chrome' ||
+      browserKey === 'firefox');
 
-  if (!isNvdaWithSupportedBrowser && !isVoiceOverMacWithSafari) {
+  if (!isNvdaWithSupportedBrowser && !isVoiceOverMacWithSupportedBrowser) {
     return false;
   }
 
@@ -89,7 +92,12 @@ export const getBotUsernameFromAtBrowser = (at, browser) => {
   ) {
     return 'NVDA Bot';
   }
-  if (at?.key === 'voiceover_macos' && browser?.key === 'safari_macos') {
+  if (
+    at?.key === 'voiceover_macos' &&
+    (browser?.key === 'safari_macos' ||
+      browser?.key === 'chrome' ||
+      browser?.key === 'firefox')
+  ) {
     return 'VoiceOver Bot';
   }
 };
diff --git a/server/migrations/20240724212706-updateMetrics.js b/server/migrations/20240724212706-updateMetrics.js
@@ -0,0 +1,64 @@
+'use strict';
+
+const { getMetrics } = require('shared');
+const populateData = require('../services/PopulatedData/populateData');
+const runnableTestsResolver = require('../resolvers/TestPlanReport/runnableTestsResolver');
+const finalizedTestResultsResolver = require('../resolvers/TestPlanReport/finalizedTestResultsResolver');
+const {
+  updateTestPlanReportById
+} = require('../models/services/TestPlanReportService');
+const getGraphQLContext = require('../graphql-context');
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction(async transaction => {
+      const context = getGraphQLContext({ req: { transaction } });
+
+      const testPlanReports = await queryInterface.sequelize.query(
+        `select distinct on ("TestPlanReport".id) "TestPlanReport".id, metrics
+         from "TestPlanReport"
+                join public."TestPlanRun" testPlanRun on "TestPlanReport".id = testPlanRun."testPlanReportId"
+         where jsonb_array_length(testPlanRun."testResults") > 0;`,
+        {
+          type: Sequelize.QueryTypes.SELECT,
+          transaction
+        }
+      );
+
+      for (const testPlanReport of testPlanReports) {
+        const { testPlanReport: testPlanReportPopulated } = await populateData(
+          { testPlanReportId: testPlanReport.id },
+          { context }
+        );
+        const runnableTests = runnableTestsResolver(
+          testPlanReportPopulated,
+          null,
+          context
+        );
+        const finalizedTestResults = await finalizedTestResultsResolver(
+          testPlanReportPopulated,
+          null,
+          context
+        );
+        const metrics = getMetrics({
+          testPlanReport: {
+            ...testPlanReportPopulated,
+            finalizedTestResults,
+            runnableTests
+          }
+        });
+        await updateTestPlanReportById({
+          id: testPlanReportPopulated.id,
+          values: {
+            metrics: {
+              ...testPlanReportPopulated.metrics,
+              ...metrics
+            }
+          },
+          transaction
+        });
+      }
+    });
+  }
+};
diff --git a/server/resolvers/TestPlanReport/finalizedTestResultsResolver.js b/server/resolvers/TestPlanReport/finalizedTestResultsResolver.js
@@ -8,6 +8,9 @@ const finalizedTestResultsResolver = async (testPlanReport, _, context) => {
   // Return the primary test plan run, otherwise pick the first TestPlanRun found.
   const testPlanRun =
     testPlanReport.testPlanRuns.find(({ isPrimary }) => isPrimary) ||
+    testPlanReport.testPlanRuns.find(testPlanRun =>
+      testPlanRun.testResults?.some(testResult => !!testResult.completedAt)
+    ) ||
     testPlanReport.testPlanRuns[0];
 
   return testResultsResolver(
diff --git a/server/services/GithubWorkflowService.js b/server/services/GithubWorkflowService.js
@@ -154,6 +154,7 @@ const createGithubWorkflow = async ({ job, directory, gitSha, atVersion }) => {
     // due to limitations on Github workflow runners
     // See https://github.com/w3c/aria-at-app/issues/1143 for more info
     inputs.macos_version = atVersion?.name?.split('.')[0];
+    inputs.browser = browser;
   }
   const axiosConfig = {
     method: 'POST',
diff --git a/shared/calculations.js b/shared/calculations.js
@@ -0,0 +1,26 @@
+/**
+ * @param {number} value
+ * @param {number} total
+ * @param {boolean} ignoreError - to account for cases where having a NaN is "expected"
+ * @returns {number}
+ */
+const calculatePercentage = (value, total, { ignoreError = true } = {}) => {
+  if (!ignoreError && total === 0) {
+    throw new Error("Unable to divide. 'total' cannot be 0.");
+  }
+  return (value / total) * 100;
+};
+
+const trimDecimals = (number, decimals = 0) => {
+  if (decimals === undefined || decimals <= 0) {
+    return Math.floor(number);
+  } else {
+    let factor = Math.pow(10, decimals);
+    return Math.floor(number * factor) / factor;
+  }
+};
+
+module.exports = {
+  calculatePercentage,
+  trimDecimals
+};
diff --git a/shared/getMetrics.js b/shared/getMetrics.js
@@ -1,4 +1,5 @@
 const convertAssertionPriority = require('./convertAssertionPriority');
+const { calculatePercentage, trimDecimals } = require('./calculations');
 
 const sum = arr => arr?.reduce((total, item) => total + item, 0) || 0;
 
@@ -46,11 +47,32 @@ const countAssertions = ({
     if (isClient) {
       all = scenarioResult?.[`${priority.toLowerCase()}AssertionResults`] || [];
     } else {
-      all = scenarioResult.assertionResults.filter(
-        a =>
+      all = scenarioResult.assertionResults.filter(a => {
+        // Same as `server/resolvers/ScenarioResult/assertionResultsResolver.js`
+        if (a.assertion?.assertionExceptions?.length) {
+          const scenarioSettings = scenarioResult.scenario.settings;
+          const scenarioCommandId =
+            scenarioResult.scenario.commandIds.join(' ');
+
+          const foundException = a.assertion.assertionExceptions.find(
+            exception =>
+              exception.settings === scenarioSettings &&
+              exception.commandId === scenarioCommandId
+          );
+
+          if (foundException) {
+            return (
+              convertAssertionPriority(foundException.priority) ===
+              convertAssertionPriority(priority)
+            );
+          }
+        }
+
+        return (
           convertAssertionPriority(a.assertion.priority) ===
           convertAssertionPriority(priority)
-      );
+        );
+      });
     }
     if (passedOnly) return all.filter(each => each.passed).length;
     return all.length;
@@ -236,9 +258,11 @@ const getMetrics = ({
     supportLevel = 'FULL';
   }
 
-  const supportPercent = Math.round(
-    (mustAssertionsPassedCount / mustAssertionsCount) * 100
+  const percentage = calculatePercentage(
+    mustAssertionsPassedCount + shouldAssertionsPassedCount,
+    mustAssertionsCount + shouldAssertionsCount
   );
+  const supportPercent = trimDecimals(percentage);
 
   const assertionsPassedCount =
     mustAssertionsPassedCount +
diff --git a/shared/index.js b/shared/index.js
@@ -1,3 +1,5 @@
+const calculations = require('./calculations');
 const convertAssertionPriority = require('./convertAssertionPriority');
 const getMetrics = require('./getMetrics');
-module.exports = { convertAssertionPriority, getMetrics };
+
+module.exports = { calculations, convertAssertionPriority, getMetrics };
diff --git a/shared/tests/__mocks__/testPlanReportForMetricsFromLiveData.json b/shared/tests/__mocks__/testPlanReportForMetricsFromLiveData.json
diff --git a/shared/tests/calculations.test.js b/shared/tests/calculations.test.js
diff --git a/shared/tests/getMetrics.test.js b/shared/tests/getMetrics.test.js

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,8 @@ function AddTestToQueueWithConfirmation({`
`166`	`166`	`} catch (e) {`
`167`	`167`	`console.error(e);`
`168`	`168`	`}`
`169`		`- }`
	`169`	`+ },`
	`170`	`+ testId: 'add-run-later'`
`170`	`171`	`});`
`171`	`172`
`172`	`173`	`if (!alreadyHasBotInTestPlanReport) {`
`@@ -186,7 +187,8 @@ function AddTestToQueueWithConfirmation({`
`186`	`187`	`} catch (e) {`
`187`	`188`	`console.error(e);`
`188`	`189`	`}`
`189`		`- }`
	`190`	`+ },`
	`191`	`+ testId: 'add-run-bot'`
`190`	`192`	`});`
`191`	`193`	`}`
`192`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,12 +132,10 @@ const SummarizeTestPlanReports = ({ testPlanVersions }) => {`
`132`	`132`	`/report/${testPlanVersion.id}` +
`133`	`133`	`/targets/${testPlanReport.id}`
`134`	`134`	`}`
	`135`	+ aria-label={`${metrics.supportPercent}%`}
`135`	`136`	`>`
`136`	`137`	`<ClippedProgressBar`
`137`	`138`	`progress={metrics.supportPercent}`
`138`		- label={`${getTestPlanTargetTitle(
`139`		`- testPlanTarget`
`140`		- )}, ${metrics.supportPercent}% completed`}
`141`	`139`	`/>`
`142`	`140`	`</Link>`
`143`	`141`	`</td>`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ const createGithubWorkflow = async ({ job, directory, gitSha, atVersion }) => {`
`154`	`154`	`// due to limitations on Github workflow runners`
`155`	`155`	`// See https://github.com/w3c/aria-at-app/issues/1143 for more info`
`156`	`156`	`inputs.macos_version = atVersion?.name?.split('.')[0];`
	`157`	`+ inputs.browser = browser;`
`157`	`158`	`}`
`158`	`159`	`const axiosConfig = {`
`159`	`160`	`method: 'POST',`