testaro 75.2.0 → 75.2.1

package/package.json

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

package/procs/catalog.js

@@ -35,7 +35,7 @@ exports.getCatalog = async report => {
   const targetURL = report.target?.url;
   // If the report specifies a global browser ID and a global target URL:
   if (browserID && targetURL) {
-    // Launch a browser, navigate to the target, and get the resulting page.
+    // Launch a browser and visit the target, or abort the job on failure.
     const page = await launch({
       report,
       actIndex: null,
@@ -159,7 +159,7 @@ exports.getCatalog = async report => {
       return catalog;
     }
     // Otherwise, i.e. if the launch or navigation failed, report and return this.
-    console.log('ERROR: Launch or navigation failure prevented catalog creation');
+    console.log('ERROR: Launch or navigation failure prevented cataloguing and aborted job');
     return {};
   }
   // Otherwise, i.e. if the report specification is incomplete, report and return this.

package/procs/launch.js

@@ -132,6 +132,7 @@ const goTo = exports.goTo = async (report, page, url, timeout, waitUntil) => {
       const actualURL = page.url();
       const actualNorm = actualURL.startsWith('file:') ? normalizeURL(actualURL) : actualURL;
       const urlNorm = url.startsWith('file:') ? normalizeURL(url) : url;
+      const title = await page.title();
       // If the browser was redirected in violation of a strictness requirement:
       if (report.strict && deSlash(actualNorm) !== deSlash(urlNorm)) {
         // Return an error.
@@ -141,6 +142,15 @@ const goTo = exports.goTo = async (report, page, url, timeout, waitUntil) => {
           error: 'badRedirection'
         };
       }
+      // Otherwise, if the browser was redirected to a CAPTCHA barrier:
+      else if ([urlNorm, title].some(identifier => identifier.includes('captcha'))) {
+        // Return this.
+        console.log(`ERROR: Visit to ${url} redirected to CAPTCHA barrier (${actualURL})`);
+        return {
+          success: false,
+          error: 'captchaBarrier'
+        };
+      }
       // Otherwise, i.e. if no prohibited redirection occurred:
       else {
         // Press the Escape key to dismiss any modal dialog.
@@ -179,6 +189,15 @@ const goTo = exports.goTo = async (report, page, url, timeout, waitUntil) => {
         error: `status429/retryAfterSeconds=${waitSeconds}`
       };
     }
+    // Otherwise, if the response status was a suspension:
+    else if (httpStatus === 202) {
+      // Return this.
+      console.log(`ERROR: Visit to ${url} suspended (status 202)`);
+      return {
+        success: false,
+        error: 'status202'
+      };
+    }
     // Otherwise, i.e. if the response status was otherwise abnormal:
     else {
       // Return an error.
@@ -626,7 +645,7 @@ exports.launch = async (opts = {}) => {
         // Report this and, if so configured, that the job was aborted.
         addError(
           true,
-          abortAssertively,
+          actIndex === null ? true : abortAssertively,
           report,
           actIndex,
           `Launch or navigation failed; retries and browser types exhausted`