testaro 36.1.2 → 36.2.0

package/package.json

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

package/procs/getLocatorData.js

@@ -1,5 +1,5 @@
 /*
-  © 2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2023–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -84,7 +84,7 @@ exports.getLocatorData = async loc => {
     if (data.location.type === 'box') {
       // Define a bounding-box-based location.
       const rawSpec = await loc.boundingBox();
-      // If there is a bounding box:
+      // If there is a bounding box (i.e. the element is visible):
       if (rawSpec) {
         // Populate the location.
         Object.keys(rawSpec).forEach(specName => {

package/procs/isInlineLink.js

@@ -1,5 +1,5 @@
 /*
-  © 2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2023–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

package/testaro/buttonMenu.js

@@ -1,5 +1,5 @@
 /*
-  © 2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2023–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

package/testaro/lineHeight.js

@@ -1,5 +1,5 @@
 /*
-  © 2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2023–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

package/testaro/motion.js

@@ -1,5 +1,5 @@
 /*
-  © 2021–2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2021–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -51,6 +51,7 @@ exports.reporter = async page => {
     delayBefore: 2000,
     delayBetween: 3000
   });
+  console.log(JSON.stringify(data, null, 2));
   // If the screenshots succeeded:
   if (data.success) {
     // If any pixels were changed:

package/testaro/tabNav.js

@@ -1,5 +1,5 @@
 /*
-  © 2021–2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2021–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

package/testaro/textNodes.js

@@ -1,5 +1,5 @@
 /*
-  © 2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2023–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

package/tests/nuVal.js

@@ -1,5 +1,5 @@
 /*
-  © 2022–2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2022–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -31,93 +31,78 @@
   erratic, no better solution is known.
 */
 
-// ########## IMPORTS
+// IMPORTS
 
 // Module to process files.
 const fs = require('fs/promises');
+// Module to get the document source.
+const {getSource} = require('../procs/getSource');
 
-// ########## FUNCTIONS
+// FUNCTIONS
 
 // Conducts and reports the Nu Html Checker tests.
 exports.reporter = async (page, options) => {
   const {rules} = options;
   // Get the browser-parsed page.
   const pageContent = await page.content();
-  // Get the page source.
-  const url = page.url();
-  const scheme = url.replace(/:.+/, '');
-  let rawPage;
-  // If it is local.
-  if (scheme === 'file') {
-    const filePath = url.slice(7);
-    rawPage = await fs.readFile(filePath, 'utf8');
-  }
-  else {
-    // If it is remote (15 seconds allowed).
-    try {
-      const rawPageResponse = await fetch(url, {signal: AbortSignal.timeout(15000)});
-      rawPage = rawPageResponse.body;
-    }
-    catch(error) {
-      console.log(`ERROR getting page for nuVal test (${error.message})`);
-      return {result: {
-        prevented: true,
-        error: 'ERROR getting page for nuVal test'
-      }};
-    }
-  }
-  // Get the data from validator.w3.org, a more reliable service than validator.nu.
-  const fetchOptions = {
-    method: 'post',
-    headers: {
-      'User-Agent': 'Mozilla/5.0',
-      'Content-Type': 'text/html; charset=utf-8'
-    }
-  };
-  const nuURL = 'https://validator.w3.org/nu/?parser=html&out=json';
+  // Get the source.
+  const sourceData = await getSource(page);
+  // If it was not obtained:
   const data = {};
   const result = {};
-  // For each page type:
-  for (const page of [['pageContent', pageContent], ['rawPage', rawPage]]) {
-    try {
-      // Get a Nu Html Checker report on it.
-      fetchOptions.body = page[1];
-      const nuResult = await fetch(nuURL, fetchOptions);
-      const nuData = await nuResult.json();
-      // Delete left and right quotation marks and their erratic invalid replacements.
-      const nuDataClean = JSON.parse(JSON.stringify(nuData).replace(/[\u{fffd}“”]/ug, ''));
-      result[page[0]] = nuDataClean;
-      // If there is a report and rules were specified:
-      if (! result[page[0]].error && rules && Array.isArray(rules) && rules.length) {
-        // Remove all messages except those specified.
-        result[page[0]].messages = result[page[0]].messages.filter(message => rules.some(rule => {
-          if (rule[0] === '=') {
-            return message.message === rule.slice(1);
-          }
-          else if (rule[0] === '~') {
-            return new RegExp(rule.slice(1)).test(message.message);
-          }
-          else {
-            console.log(`ERROR: Invalid nuVal rule ${rule}`);
-            return false;
-          }
-        }));
+  if (sourceData.prevented) {
+    // Report this.
+    data.prevented = true;
+    data.error = sourceData.error;
+  }
+  // Otherwise, i.e. if it was obtained:
+  else {
+    // Get results from validator.w3.org, a more reliable service than validator.nu.
+    const fetchOptions = {
+      method: 'post',
+      headers: {
+        'User-Agent': 'Mozilla/5.0',
+        'Content-Type': 'text/html; charset=utf-8'
       }
-      return {
-        data,
-        result
-      };
-    }
-    catch (error) {
-      const message = `ERROR: Act failed (${error.message})`;
-      console.log(message);
-      return {
-        data: {
-          prevented: true,
-          error: message,
-        },
-        result: {}
+    };
+    const nuURL = 'https://validator.w3.org/nu/?parser=html&out=json';
+    // For each page type:
+    for (const page of [['pageContent', pageContent], ['rawPage', sourceData.source]]) {
+      try {
+        // Get a Nu Html Checker report on it.
+        fetchOptions.body = page[1];
+        const nuResult = await fetch(nuURL, fetchOptions);
+        const nuData = await nuResult.json();
+        // Delete left and right quotation marks and their erratic invalid replacements.
+        const nuDataClean = JSON.parse(JSON.stringify(nuData).replace(/[\u{fffd}“”]/ug, ''));
+        result[page[0]] = nuDataClean;
+        // If there is a report and rules were specified:
+        if (! result[page[0]].error && rules && Array.isArray(rules) && rules.length) {
+          // Remove all messages except those specified.
+          result[page[0]].messages = result[page[0]].messages.filter(message => rules.some(rule => {
+            if (rule[0] === '=') {
+              return message.message === rule.slice(1);
+            }
+            else if (rule[0] === '~') {
+              return new RegExp(rule.slice(1)).test(message.message);
+            }
+            else {
+              console.log(`ERROR: Invalid nuVal rule ${rule}`);
+              return false;
+            }
+          }));
+        }
+      }
+      catch (error) {
+        const message = `ERROR getting results for ${page[0]} (${error.message})`;
+        console.log(message);
+        data.prevented = true;
+        data.error = message;
       };
-    }
+    };
   }
+  return {
+    data,
+    result
+  };
 };

package/tests/testaro.js

@@ -1,5 +1,5 @@
 /*
-  © 2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2023–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal