testaro 28.2.2 → 28.2.4

package/package.json

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

package/run.js

@@ -13,9 +13,6 @@ const {actSpecs} = require('./actSpecs');
 const {browserClose, getNonce, goTo, launch} = require('./procs/nav');
 // Module to standardize report formats.
 const {standardize} = require('./procs/standardize');
-// HTTP and HTTPS clients.
-const http = require('http');
-const https = require('https');
 
 // ########## CONSTANTS
 
@@ -118,7 +115,7 @@ const hasSubtype = (variable, subtype) => {
       return tests[variable];
     }
     else if (subtype === 'isWaitable') {
-      return waitables.includes(variable);
+      return ['url', 'title', 'body'].includes(variable);
     }
     else if (subtype === 'areNumbers') {
       return areNumbers(variable);
@@ -483,7 +480,7 @@ const doActs = async (report, actIndex, page) => {
         // If the notification threw an error:
         request.on('error', error => {
           // Report the error.
-          const errorMessage = `ERROR notifying the server of an act`;
+          const errorMessage = 'ERROR notifying the server of an act';
           console.log(`${errorMessage} (${error.message})`);
         });
         request.end();
@@ -582,12 +579,12 @@ const doActs = async (report, actIndex, page) => {
               addError(act, 'badRedirection', 'ERROR: Navigation illicitly redirected');
               await abortActs();
             }
-          }
-          // If the visit failed:
-          if (response.error) {
-            // Report this and quit.
-            addError(act, 'failure', 'ERROR: Visits failed');
-            await abortActs();
+            // Otherwise, i.e. if the visit failed:
+            else {
+              // Report this and quit.
+              addError(act, 'failure', 'ERROR: Visit failed');
+              await abortActs();
+            }
           }
         }
         // Otherwise, if the act is a wait for text:

package/watch.js

@@ -158,7 +158,7 @@ const writeDirReport = async report => {
       console.log(`Report ${reportName} saved in ${rawDir}`);
     }
     catch(error) {
-      console.log(`ERROR: Failed to write report (${error.message})`);
+      console.log(`ERROR: Failed to write report ${jobID} (${error.message})`);
     }
   }
   else {
@@ -223,7 +223,6 @@ const writeNetReport = async report => {
   else {
     return '';
   }
-  return ack;
 };
 // Archives a job.
 const archiveJob = async (job, watchee) => {
@@ -255,7 +254,7 @@ const runJob = async (job, isDirWatch) => {
       }
       // Otherwise, i.e. if the network was watched:
       else {
-        // Send the report to the server.
+        // Send the report to the server and report its response.
         const ack = await writeNetReport(job);
         console.log(ack);
       }
@@ -279,7 +278,7 @@ exports.cycle = async (isDirWatch, isForever, interval = 300, watchee = null) =>
   let empty = false;
   const intervalMS = 1000 * Number.parseInt(interval);
   const intervalSpec = isForever ? `with intervals of ${interval} seconds when idle ` : '';
-  console.log(`Watching started ${intervalSpec}(${nowString()})`);
+  console.log(`Watching started ${intervalSpec}(${nowString()})\n`);
   while (statusOK) {
     if (empty) {
       await wait(intervalMS);