testaro 59.2.7 → 59.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "59.2.7",
+  "version": "59.2.9",
   "description": "Run 1000 web accessibility tests from 11 tools and get a standardized report",
   "main": "index.js",
   "scripts": {

package/procs/visChange.js

@@ -34,6 +34,7 @@
 
 // IMPORTS
 
+const pixelmatch = require('pixelmatch').default;
 const {PNG} = require('pngjs');
 
 // FUNCTIONS
@@ -103,8 +104,6 @@ exports.visChange = async (page, options = {}) => {
       // Get their dimensions.
       const {width, height} = pngs[0];
       // Get the count of differing pixels between the shots.
-      const pixelmatchModule = await import('pixelmatch');
-      const pixelmatch = pixelmatchModule.default;
       const pixelChanges = pixelmatch(pngs[0].data, pngs[1].data, null, width, height);
       // Get the ratio of differing to all pixels as a percentage.
       const changePercent = 100 * pixelChanges / (width * height);

package/tests/alfa.js

@@ -1,5 +1,6 @@
 /*
   © 2021–2024 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2025 Jonathan Robert Pool. All rights reserved.
 
   MIT License
 
@@ -27,26 +28,27 @@
   This test implements the alfa ruleset for accessibility.
 */
 
+// IMPORTS
+
+let alfaRules = require('@siteimprove/alfa-rules').default;
+const {Audit} = require('@siteimprove/alfa-act');
+const path = require('path');
+const {Playwright} = require('@siteimprove/alfa-playwright');
+
 // FUNCTIONS
 
+// Simplifies the spacing of a string.
+const tidy = string => string.replace(/\n/g, ' ').replace(/\s+/g, ' ');
+
 // Conducts and reports the alfa tests.
-exports.reporter = async (page, report, actIndex, timeLimit) => {
+exports.reporter = async (page, report, actIndex) => {
   const act = report.acts[actIndex];
   const {rules} = act;
-  const alfaRulesModule = await import('@siteimprove/alfa-rules');
-  const alfaRules = alfaRulesModule.default;
   // If only some rules are to be employed:
   if (rules && rules.length) {
     // Remove the other rules.
     alfaRules = alfaRules.filter(rule => rules.includes(rule.uri.replace(/^.+-/, '')));
   }
-  // Open a page for the summaries of the alfa rules.
-  const context = page.context();
-  const rulePage = await context.newPage();
-  rulePage.on('console', msg => {
-    const msgText = msg.text();
-    console.log(msgText);
-  });
   // Initialize the act report.
   const data = {};
   const result = {
@@ -57,52 +59,28 @@ exports.reporter = async (page, report, actIndex, timeLimit) => {
     items: []
   };
   try {
-    // Get the Alfa rules.
-    const response = await rulePage.goto('https://alfa.siteimprove.com/rules', {timeout: 10000});
-    let ruleData = {};
-    // If they were obtained:
-    if (response.status() === 200) {
-      // Compile data on the rule IDs and summaries.
-      ruleData = await rulePage.evaluate(() => {
-        const rulePs = Array.from(document.querySelectorAll('p.h5'));
-        const ruleData = {};
-        rulePs.forEach(ruleP => {
-          const childNodes = Array.from(ruleP.childNodes);
-          const ruleID = childNodes[0].textContent.slice(4).toLowerCase();
-          const ruleText = childNodes
-          .slice(1)
-          .map(node => node.textContent)
-          .join(' ')
-          .trim()
-          .replace(/"/g, '\'')
-          .replace(/\s+/g, ' ');
-          ruleData[ruleID] = ruleText;
-        });
-        return ruleData;
-      });
-      await rulePage.close();
-    }
     // Test the page content with the specified rules.
     const doc = await page.evaluateHandle('document');
-    const alfaPlaywrightModule = await import('@siteimprove/alfa-playwright');
-    const {Playwright} = alfaPlaywrightModule;
     const alfaPage = await Playwright.toPage(doc);
-    const alfaActModule = await import('@siteimprove/alfa-act');
-    const {Audit} = alfaActModule;
     const audit = Audit.of(alfaPage, alfaRules);
+    // Get the test outcomes.
     const outcomes = Array.from(await audit.evaluate());
-    // For each failure or warning:
+    // For each outcome:
     outcomes.forEach((outcome, index) => {
       const {target} = outcome;
+      // If the target exists and is not a collection:
       if (target && ! target._members) {
+        // Convert the outcome to an object.
         const outcomeJ = outcome.toJSON();
+        // Get the verdict.
         const verdict = outcomeJ.outcome;
+        // If the verdict is a failure or warning:
         if (verdict !== 'passed') {
           // Add to the result.
-          const {rule} = outcomeJ;
+          const {expectations, rule} = outcomeJ;
           const {tags, uri, requirements} = rule;
           const ruleID = uri.replace(/^.+-/, '');
-          const ruleSummary = ruleData[ruleID] || '';
+          let ruleSummary = tidy(expectations?.[0]?.[1]?.error?.message || '');
           const targetJ = outcomeJ.target;
           const codeLines = target.toString().split('\n');
           if (codeLines[0] === '#document') {
@@ -161,7 +139,7 @@ exports.reporter = async (page, report, actIndex, timeLimit) => {
     });
   }
   catch(error) {
-    console.log(`ERROR: navigation to URL timed out (${error})`);
+    console.log(`ERROR: Navigation to URL timed out (${error})`);
     data.prevented = true;
     data.error = 'ERROR: Act failed';
   }