testaro 52.0.1 → 52.0.2

package/dirWatch.js

@@ -99,7 +99,6 @@ const wait = ms => {
 exports.dirWatch = async (isForever, intervalInSeconds) => {
   intervalInSeconds ||= 5;
   intervalInSeconds = Math.max(intervalInSeconds, 5);
-  console.log(intervalInSeconds);
   console.log(`Starting to watch directory ${jobDir}/todo for jobs`);
   let notYetRun = true;
   // As long as watching as to continue:

package/package.json

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

package/procs/doTestAct.js

@@ -44,6 +44,8 @@ const waits = Number.parseInt(process.env.WAITS) || 0;
 
 const actIndex = Number.parseInt(process.argv[2]);
 
+// FUNCTIONS
+
 const doTestAct = async () => {
   const reportPath = `${__dirname}/../temp/report.json`;
   // Get the saved report.
@@ -53,7 +55,7 @@ const doTestAct = async () => {
   const act = report.acts[actIndex];
   // Get the tool name.
   const {which} = act;
-  // Launch a browser, navigate to the URL, and redefine the page of the run module.
+  // Launch a browser, navigate to the URL, and redefine the page export of the run module.
   await launch(
     report,
     debug,

package/procs/identify.js

@@ -33,8 +33,6 @@
 const getPath = {
   xPath: require('playwright-dompath').xPath
 };
-// Utility module.
-const {doBy} = require('./job');
 
 // FUNCTIONS
 
@@ -83,10 +81,13 @@ const addIDs = async (locators, recipient) => {
       const box = await boxOf(locators);
       recipient.boxID = boxToString(box);
     }
-    // Add the path ID of the element to the result if none exists yet.
+    // If the element has no path ID yet in the result:
     if (! recipient.pathID) {
-      const pathID = await doBy(1, getPath, 'xPath', [locators], 'xPath identification');
-      if (pathID !== 'timedOut') {
+      // Add it to the result.
+      const pathIDPromise = getPath.xPath(locators);
+      const timeoutPromise = setTimeout(() => true, 1000);
+      const pathID = Promise.race([pathIDPromise, timeoutPromise]);
+      if (typeof pathID === 'string') {
         recipient.pathID = pathID;
       }
     }
@@ -159,10 +160,7 @@ exports.identify = async (instance, page) => {
     }
     // If either ID remains undefined and the instance specifies an element ID:
     if (id && ! (elementID.boxID && elementID.pathID)) {
-      /*
-        Get the first locator for an element with the ID, or throw an error if the identifier is
-        invalid.
-      */
+      // Get the first locator for an element with the ID.
       try {
         let locator = page.locator(`#${id.replace(/([-&;/]|^\d)/g, '\\$1')}`).first();
         // Add a box ID and a path ID to the result.

package/run.js

@@ -197,7 +197,7 @@ const browserClose = async () => {
     browser = null;
   }
 };
-// Launches a browser, navigates to a URL, and returns browser data.
+// Launches a browser and navigates to a URL.
 const launch = exports.launch = async (report, debug, waits, tempBrowserID, tempURL) => {
   const act = report.acts[actIndex];
   const {device} = report;
@@ -674,16 +674,33 @@ const doActs = async (report) => {
             };
             // Populate it.
             standardize(act);
-            // Add a box ID and a path ID to each of its standard instances if missing.
-            for (const instance of act.standardResult.instances) {
-              const elementID = await identify(instance, page);
-              if (! instance.boxID) {
-                instance.boxID = elementID ? elementID.boxID : '';
-              }
-              if (! instance.pathID) {
-                instance.pathID = elementID ? elementID.pathID : '';
-              }
-            };
+            // Launch a browser and navigate to the page.
+            await launch(
+              report,
+              debug,
+              waits,
+              act.browserID || report.browserID || '',
+              act.target && act.target.url || report.target && report.target.url || ''
+            );
+            // If this failed:
+            if (page.prevented) {
+              // Add this to the act.
+              act.prevented = true;
+              act.error = page.error || '';
+            }
+            // Otherwise, i.e. if it succeeded:
+            else {
+              // Add a box ID and a path ID to each of its standard instances if missing.
+              for (const instance of act.standardResult.instances) {
+                const elementID = await identify(instance, page);
+                if (! instance.boxID) {
+                  instance.boxID = elementID ? elementID.boxID : '';
+                }
+                if (! instance.pathID) {
+                  instance.pathID = elementID ? elementID.pathID : '';
+                }
+              };
+            }
             // If the original-format result is not to be included in the report:
             if (standard === 'only') {
               // Remove it.