testaro 60.10.0 → 60.10.2

package/package.json

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

package/procs/identify.js

@@ -30,9 +30,7 @@
 // IMPORTS
 
 // Module to get the XPath of an element.
-const getPath = {
-  xPath: require('playwright-dompath').xPath
-};
+const {xPath} = require('playwright-dompath');
 
 // FUNCTIONS
 
@@ -42,7 +40,7 @@ const boxOf = exports.boxOf = async locator => {
     const isVisible = await locator.isVisible();
     if (isVisible) {
       const box = await locator.boundingBox({
-        timeout: 50
+        timeout: 100
       });
       if (box) {
         Object.keys(box).forEach(dim => {
@@ -72,22 +70,31 @@ const boxToString = exports.boxToString = box => {
   }
 };
 // Adds a box ID and a path ID to an object.
-const addIDs = async (locators, recipient) => {
+const addIDs = async (locator, recipient) => {
+  const locatorCount = await locator.count();
   // If there is exactly 1 of them:
-  const locatorCount = await locators.count();
   if (locatorCount === 1) {
     // Add the box ID of the element to the result if none exists yet.
     if (! recipient.boxID) {
-      const box = await boxOf(locators);
+      const box = await boxOf(locator);
       recipient.boxID = boxToString(box);
     }
     // If the element has no path ID yet in the result:
     if (! recipient.pathID) {
-      // Add it to the result.
-      const pathIDPromise = getPath.xPath(locators);
-      const timeoutPromise = setTimeout(() => true, 1000);
-      const pathID = Promise.race([pathIDPromise, timeoutPromise]);
+      let timeout;
+      const timer = new Promise(resolve => {
+        timeout = setTimeout(() => {
+          resolve({timedOut: true})
+        }, 500);
+      });
+      // Use Playwright to get the XPath.
+      const pathIDPromise = xPath(locator);
+      const pathID = await Promise.race([pathIDPromise, timer]);
+      // If the XPath was computed before being timed out:
       if (typeof pathID === 'string') {
+        // Prevent the timeout from resolving.
+        clearTimeout(timeout);
+        // Add the XPath to the result.
         recipient.pathID = pathID;
       }
     }

package/run.js

@@ -446,8 +446,54 @@ const launch = exports.launch = async (
         });
       });
       const isTestaroTest = act.type === 'test' && act.which === 'testaro';
-      // If the act is a testaro test act:
+      // If the launch is for a testaro test act:
       if (isTestaroTest) {
+        // Add a script to the page to add a window method to get the XPath of an element.
+        await page.addInitScript(() => {
+          window.getXPath = element => {
+            if (! element || element.nodeType !== Node.ELEMENT_NODE) {
+              return '';
+            }
+            const segments = [];
+            // As long as the current node is an element:
+            while (element && element.nodeType === Node.ELEMENT_NODE) {
+              const tag = element.tagName.toLowerCase();
+              // If it is the html element:
+              if (element === document.documentElement) {
+                // Prepend it to the segment array
+                segments.unshift('html');
+                // Stop traversing.
+                break;
+              }
+              // Otherwise, get its parent node.
+              const parent = element.parentNode;
+              // If (abnormally) the parent node is not an element:
+              if (!parent || parent.nodeType !== Node.ELEMENT_NODE) {
+                // Prepend it to the segment array.
+                segments.unshift(tag);
+                // Stop traversing, leaving the segment array partial.
+                break;
+              }
+              let subscript = '';
+              // Get the subscript of the element.
+              const cohort = Array
+              .from(parent.childNodes)
+              .filter(
+                childNode => childNode.nodeType === Node.ELEMENT_NODE
+                && childNode.tagName === element.tagName
+              );
+              if (cohort.length > 1) {
+                subscript = `[${cohort.indexOf(element) + 1}]`;
+              }
+              // Prepend the element identifier to the segment array.
+              segments.unshift(`${tag}${subscript}`);
+              // Continue the traversal with the parent of the current element.
+              element = parent;
+            }
+            // Return the XPath.
+            return `/${segments.join('/')}`;
+          };
+        });
         // Add a script to the page to compute the accessible name of an element.
         await page.addInitScript({path: require.resolve('./dist/nameComputation.js')});
         // Add a script to the page to:
@@ -515,52 +561,6 @@ const launch = exports.launch = async (
               pathID: ''
             };
           };
-          // Add a window method to get the XPath of an element.
-          window.getXPath = element => {
-            if (!element || element.nodeType !== Node.ELEMENT_NODE) {
-              return '';
-            }
-            const segments = [];
-            let el = element;
-            // As long as the current node is an element:
-            while (el && el.nodeType === Node.ELEMENT_NODE) {
-              const tag = el.tagName.toLowerCase();
-              // If it is the html element:
-              if (el === document.documentElement) {
-                // Prepend it to the segment array
-                segments.unshift('html');
-                // Stop traversing.
-                break;
-              }
-              // Otherwise, get its parent node.
-              const parent = el.parentNode;
-              // If (abnormally) the parent node is not an element:
-              if (!parent || parent.nodeType !== Node.ELEMENT_NODE) {
-                // Prepend it to the segment array.
-                segments.unshift(tag);
-                // Stop traversing, leaving the segment array partial.
-                break;
-              }
-              let subscript = '';
-              let sameTagCount = 0;
-              // Get the subscript of the element.
-              const cohort = Array
-              .from(parent.childNodes)
-              .filter(
-                childNode => childNode.nodeType === Node.ELEMENT_NODE
-                && childNode.tagName === el.tagName
-              );
-              if (cohort.length > 1) {
-                subscript = `[${cohort.indexOf(el) + 1}]`;
-              }
-              // Prepend the element identifier to the segment array.
-              segments.unshift(`${tag}${subscript}`);
-              // Continue the traversal with the parent of the current element.
-              el = parent;
-            }
-            // Return the XPath.
-            return `/${segments.join('/')}`;
-          };
         });
       }
       // Navigate to the specified URL.
@@ -1659,7 +1659,7 @@ const doActs = async (report, opts = {}) => {
       // Replace the browser and navigate to the URL.
       await launch(
         report,
-        '',
+        'standardization',
         'high',
         specs[0],
         specs[1]