testaro 57.2.0 → 57.4.0

package/package.json

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

package/procs/doTestAct.js

@@ -54,7 +54,7 @@ const doTestAct = async () => {
   // Get the saved report.
   const reportJSON = await fs.readFile(reportPath, 'utf8');
   const report = JSON.parse(reportJSON);
-  // Get the act.
+  // Get a reference to the act in the report.
   const act = report.acts[actIndex];
   // Get the tool name.
   const {which} = act;
@@ -94,7 +94,7 @@ const doTestAct = async () => {
           act.data = actReport.data;
           act.result = actReport.result;
           // If the tool reported that the page prevented testing:
-          if (actReport.data && actReport.data.prevented) {
+          if (act.data && act.data.prevented) {
             // Add prevention data to the job data.
             report.jobData.preventions[which] = act.data.error;
           }
@@ -118,8 +118,19 @@ const doTestAct = async () => {
     }
     // Otherwise, i.e. if the page does not exist:
     else {
+      // Add data to the act.
+      act.data ??= {};
+      act.data.prevented = true;
+      act.data.error = 'No page';
+      // Add prevention data to the job data.
+      report.jobData.preventions[which] = act.data.error;
+      // Save the revised report.
+      const reportJSON = JSON.stringify(report);
+      await fs.writeFile(reportPath, reportJSON);
       // Report this.
-      process.send('ERROR: No page');
+      const message = 'ERROR: No page';
+      console.log(message);
+      process.send(message);
     }
   }
 };

package/run.js

@@ -174,7 +174,7 @@ const goTo = async (report, page, url, timeout, waitUntil) => {
     // Otherwise, if the response status was rejection of excessive requests:
     else if (httpStatus === 429) {
       // Return this.
-      console.log(`Visit to ${url} prevented by request frequency restriction (status 429)`);
+      console.log(`ERROR: Visit to ${url} prevented by request frequency limit (status 429)`);
       return {
         success: false,
         error: 'status429'
@@ -356,15 +356,15 @@ const launch = exports.launch = async (report, debug, waits, tempBrowserID, temp
       }
       // Otherwise, i.e. if the launch or navigation failed:
       else {
-        // Report this and nullify the page.
-        addError(true, true, report, actIndex, `ERROR: Launch failed (${navResult.error})`);
+        // Report this.
+        addError(true, false, report, actIndex, `ERROR: Launch failed (${navResult.error})`);
         page = null;
       }
     }
     // If an error occurred:
     catch(error) {
       // Report this.
-      addError(true, true, report, actIndex, `ERROR launching or navigating ${error.message}`);
+      addError(true, false, report, actIndex, `ERROR launching or navigating ${error.message}`);
       page = null;
     };
   }
@@ -633,8 +633,9 @@ const doActs = async (report) => {
         // If this failed:
         if (page.prevented) {
           // Add this to the act.
-          act.prevented = true;
-          act.error = page.error || '';
+          act.data ??= {};
+          act.data.prevented = true;
+          act.data.error = page.error || '';
         }
       }
       // Otherwise, if the act is a test act:
@@ -708,8 +709,9 @@ const doActs = async (report) => {
               // If this failed:
               if (page.prevented) {
                 // Add this to the act.
-                act.prevented = true;
-                act.error = page.error || '';
+                act.data ??= {};
+                act.data.prevented = true;
+                act.data.error = page.error || '';
               }
               // Otherwise, i.e. if it succeeded:
               else {
@@ -782,14 +784,14 @@ const doActs = async (report) => {
             act.result.url = page.url();
             // If a prohibited redirection occurred:
             if (response.exception === 'badRedirection') {
-              // Report this and abort the job.
-              addError(true, true, report, actIndex, 'ERROR: Navigation illicitly redirected');
+              // Report this.
+              addError(true, false, report, actIndex, 'ERROR: Navigation illicitly redirected');
             }
           }
           // Otherwise, i.e. if the visit failed:
           else {
-            // Report this and abort the job.
-            addError(true, true, report, actIndex, 'ERROR: Visit failed');
+            // Report this.
+            addError(true, false, report, actIndex, 'ERROR: Visit failed');
           }
         }
         // Otherwise, if the act is a wait for text:
@@ -871,7 +873,7 @@ const doActs = async (report) => {
           .catch(async error => {
             // Report this and abort the job.
             console.log(`ERROR waiting for page to be ${act.which} (${error.message})`);
-            addError(true, true, report, actIndex, `ERROR waiting for page to be ${act.which}`);
+            addError(true, false, report, actIndex, `ERROR waiting for page to be ${act.which}`);
           });
           // If the wait succeeded:
           if (actIndex > -2) {
@@ -1015,7 +1017,7 @@ const doActs = async (report) => {
                 // If the move fails:
                 catch(error) {
                   // Add the error result to the act and abort the job.
-                  addError(true, true, report, actIndex, `ERROR: ${move} failed`);
+                  addError(true, false, report, actIndex, `ERROR: ${move} failed`);
                 }
                 if (act.result.success) {
                   try {
@@ -1349,19 +1351,19 @@ const doActs = async (report) => {
           // Otherwise, i.e. if the act type is unknown:
           else {
             // Add the error result to the act and abort the job.
-            addError(true, true, report, actIndex, 'ERROR: Invalid act type');
+            addError(true, false, report, actIndex, 'ERROR: Invalid act type');
           }
         }
         // Otherwise, a page URL is required but does not exist, so:
         else {
           // Add an error result to the act and abort the job.
-          addError(true, true, report, actIndex, 'ERROR: Page has no URL');
+          addError(true, false, report, actIndex, 'ERROR: Page has no URL');
         }
       }
       // Otherwise, i.e. if no page exists:
       else {
         // Add an error result to the act and abort the job.
-        addError(true, true, report, actIndex, 'ERROR: No page identified');
+        addError(true, false, report, actIndex, 'ERROR: No page identified');
       }
       // Add the end time to the act.
       act.endTime = Date.now();

package/tests/ed11y.js

@@ -187,10 +187,12 @@ exports.reporter = async (page, report, actIndex, timeLimit) => {
       };
     }
     // Return the data and result, discarding the separate element data.
+    const data = {};
+    if (result.prevented) {
+      data.prevented = true;
+    }
     return {
-      data: {
-        prevented: result.prevented
-      },
+      data,
       result
     };
   }
@@ -198,12 +200,8 @@ exports.reporter = async (page, report, actIndex, timeLimit) => {
   else {
     // Return this.
     return {
-      data: {
-        prevented: false
-      },
-      result: {
-        prevented: false,
-      }
+      data: {},
+      result: {}
     }
   }
 };