testaro 30.0.4 → 30.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "30.0.4",
+  "version": "30.0.7",
   "description": "Run 960 web accessibility tests from 9 tools and get a standardized report",
   "main": "index.js",
   "scripts": {

package/procs/nav.js

@@ -119,7 +119,6 @@ const goTo = async (report, page, url, timeout, waitUntil) => {
 // Closes the current browser.
 const browserClose = async () => {
   if (browser) {
-    const browserType = browser.browserType().name();
     let contexts = browser.contexts();
     for (const context of contexts) {
       await context.close();
@@ -129,7 +128,7 @@ const browserClose = async () => {
     browser = null;
   }
 };
-// Launches a browser, navigates to a URL, and returns the status.
+// Launches a browser, navigates to a URL, and returns browser data.
 const launch = async (report, typeName, url, debug, waits, isLowMotion = false) => {
   // If the specified browser type exists:
   const browserType = playwright[typeName];
@@ -152,7 +151,6 @@ const launch = async (report, typeName, url, debug, waits, isLowMotion = false)
     browser = await browserType.launch(browserOptions)
     // If the launch failed:
     .catch(async error => {
-      healthy = false;
       console.log(`ERROR launching browser (${error.message.slice(0, 200)})`);
       // Return this.
       return {
@@ -162,11 +160,9 @@ const launch = async (report, typeName, url, debug, waits, isLowMotion = false)
     });
     // Open a context (i.e. browser tab), with reduced motion if specified.
     const options = {reduceMotion: isLowMotion ? 'reduce' : 'no-preference'};
-    browserContext = await browser.newContext(options);
+    const browserContext = await browser.newContext(options);
     // When a page (i.e. browser tab) is added to the browser context (i.e. browser window):
     browserContext.on('page', async page => {
-      // Make the page current.
-      currentPage = page;
       // If it emits a message:
       page.on('console', msg => {
         const msgText = msg.text();
@@ -210,22 +206,22 @@ const launch = async (report, typeName, url, debug, waits, isLowMotion = false)
       });
     });
     // Open the first page of the context.
-    currentPage = await browserContext.newPage();
+    const page = await browserContext.newPage();
     try {
       // Wait until it is stable.
-      await currentPage.waitForLoadState('domcontentloaded', {timeout: 5000});
+      await page.waitForLoadState('domcontentloaded', {timeout: 5000});
       // Navigate to the specified URL.
-      const navResult = await goTo(report, currentPage, url, 15000, 'domcontentloaded');
+      const navResult = await goTo(report, page, url, 15000, 'domcontentloaded');
       // If the navigation succeeded:
       if (navResult.success) {
         // Update the name of the current browser type and store it in the page.
-        currentPage.browserTypeName = typeName;
-        // Return the response, the browser context, and the page.
+        page.browserTypeName = typeName;
+        // Return the response of the target server, the browser context, and the page.
         return {
           success: true,
           response: navResult.response,
           browserContext,
-          currentPage
+          page
         };
       }
       // If the navigation failed:
@@ -237,7 +233,7 @@ const launch = async (report, typeName, url, debug, waits, isLowMotion = false)
         };
       }
     }
-    // If it fails to become stable by the deadline:
+    // If it fails to become stable after load:
     catch(error) {
       // Return this.
       console.log(`ERROR: Blank page load in new tab timed out (${error.message})`);

package/run.js

@@ -422,7 +422,10 @@ const wait = ms => {
   });
 };
 // Adds an error result to an act.
-const addError = (act, error, message) => {
+const addError = (alsoLog, act, error, message) => {
+  if (alsoLog) {
+    console.log(`${message} (${error})`);
+  }
   if (! act.result) {
     act.result = {};
   }
@@ -516,12 +519,13 @@ const doActs = async (report, actIndex, page) => {
         );
         // If the launch and navigation succeeded:
         if (launchResult && launchResult.success) {
-          // Save the browser data.
-          const {response, currentPage} = launchResult;
-          page = currentPage;
+          // Get the response of the target server.
+          const {response} = launchResult;
+          // Get the target page.
+          page = launchResult.page;
           // Add the actual URL to the act.
           act.actualURL = page.url();
-          // Add any nonce to the Act.
+          // Add the script nonce, if any, to the act.
           const scriptNonce = await getNonce(response);
           if (scriptNonce) {
             report.jobData.lastScriptNonce = scriptNonce;
@@ -529,6 +533,8 @@ const doActs = async (report, actIndex, page) => {
         }
         // Otherwise, i.e. if the launch or navigation failed:
         else {
+          // Add an error result to the act.
+          addError(true, act, 'badLaunch', `ERROR: Launch failed (${launchResult.error})`);
           // Abort the job.
           await abortActs();
         }
@@ -558,13 +564,13 @@ const doActs = async (report, actIndex, page) => {
             // If a prohibited redirection occurred:
             if (response.exception === 'badRedirection') {
               // Report this and quit.
-              addError(act, 'badRedirection', 'ERROR: Navigation illicitly redirected');
+              addError(true, act, 'badRedirection', 'ERROR: Navigation illicitly redirected');
               await abortActs();
             }
             // Otherwise, i.e. if the visit failed:
             else {
               // Report this and quit.
-              addError(act, 'failure', 'ERROR: Visit failed');
+              addError(true, act, 'failure', 'ERROR: Visit failed');
               await abortActs();
             }
           }
@@ -648,7 +654,7 @@ const doActs = async (report, actIndex, page) => {
           .catch(async error => {
             // Quit.
             console.log(`ERROR waiting for page to be ${act.which} (${error.message})`);
-            addError(act, 'timeout', `ERROR waiting for page to be ${act.which}`);
+            addError(true, act, 'timeout', `ERROR waiting for page to be ${act.which}`);
             await abortActs();
           });
           // If the wait succeeded:
@@ -865,11 +871,9 @@ const doActs = async (report, actIndex, page) => {
                 }
                 // If the move fails:
                 catch(error) {
-                  // Quit and add failure data to the report.
-                  act.result.success = false;
-                  act.result.error = 'moveFailure';
-                  act.result.message = `ERROR: ${move} failed`;
-                  console.log(`ERROR: ${move} failed (${errorStart(error)})`);
+                  // Add the error result to the act.
+                  addError(true, act, 'moveFailure', `ERROR: ${move} failed`);
+                  // Abort.
                   await abortActs();
                 }
                 if (act.result.success) {
@@ -1207,19 +1211,25 @@ const doActs = async (report, actIndex, page) => {
           // Otherwise, i.e. if the act type is unknown:
           else {
             // Add the error result to the act.
-            addError(act, 'badType', 'ERROR: Invalid act type');
+            addError(true, act, 'badType', 'ERROR: Invalid act type');
+            // Abort.
+            await abortActs();
           }
         }
         // Otherwise, a page URL is required but does not exist, so:
         else {
           // Add an error result to the act.
-          addError(act, 'noURL', 'ERROR: Page has no URL');
+          addError(true, act, 'noURL', 'ERROR: Page has no URL');
+          // Abort.
+          await abortActs();
         }
       }
       // Otherwise, i.e. if no page exists:
       else {
         // Add an error result to the act.
-        addError(act, 'noPage', 'ERROR: No page identified');
+        addError(true, act, 'noPage', 'ERROR: No page identified');
+        // Abort.
+        await abortActs();
       }
       act.endTime = Date.now();
     }
@@ -1228,7 +1238,8 @@ const doActs = async (report, actIndex, page) => {
       // Quit and add error data to the report.
       const errorMsg = `ERROR: Invalid act of type ${act.type}`;
       console.log(errorMsg);
-      addError(act, 'badAct', errorMsg);
+      addError(true, act, 'badAct', errorMsg);
+      // Abort.
       await abortActs();
     }
     // Perform any remaining acts if not aborted.

package/watch.js

@@ -158,8 +158,8 @@ const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount
     // When the response arrives:
     .on('end', async () => {
       const content = chunks.join('');
-      // If there was no job to do:
       try {
+        // If there was no job to do:
         let contentObj = JSON.parse(content);
         if (! Object.keys(contentObj).length) {
           // Report this.
@@ -178,14 +178,17 @@ const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount
             await checkNetJob(servers, serverIndex + 1, isForever, interval, noJobCount + 1);
           }
           // Otherwise, if the server sent a valid job:
-          else if (id && sources) {
+          else if (id && sources && sources.target && sources.target.which) {
             // Add the agent to it.
             sources.agent = agent;
             // If the job specifies a report destination:
             const {sendReportTo} = sources;
             if (sendReportTo) {
               // Perform the job, adding result data to it.
-              console.log(`${logStart}job ${id} for ${sendReportTo} (${nowString()})`);
+              const testee = sources.target.which;
+              console.log(
+                `${logStart}job ${id} (${nowString()})\n>> It will test ${testee}\n>> It will send report to ${sendReportTo}`
+              );
               await doJob(contentObj);
               let reportJSON = JSON.stringify(contentObj, null, 2);
               console.log(`Job ${id} finished (${nowString()})`);
@@ -279,12 +282,10 @@ const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount
           }
         }
       }
-      // If the response to the job request threw an error:
+      // If an error is thrown:
       catch(error) {
         // Report this.
-        console.log(
-          `ERROR: ${logStart}status ${response.statusCode}, error message ${error.message}, and response ${content.slice(0, 1000)}`
-        );
+        console.log(`ERROR: ${error.message} (response ${content.slice(0, 1000)})`);
         // Check the next server.
         await checkNetJob(servers, serverIndex + 1, isForever, interval, noJobCount + 1);
       }