testaro 32.0.0 → 32.0.2

package/package.json

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

package/run.js

@@ -325,7 +325,7 @@ const goTo = async (report, page, url, timeout, waitUntil) => {
   // If the URL is a file path:
   if (url.startsWith('file://')) {
     // Make it absolute.
-    url = url.replace('file://', `file://${__dirname.replace(/procs$/, '')}`);
+    url = url.replace('file://', `file://${__dirname}/`);
   }
   // Visit the URL.
   const startTime = Date.now();
@@ -725,6 +725,7 @@ const addError = async(alsoLog, alsoAbort, report, actIndex, message) => {
 };
 // Recursively performs the acts in a report.
 const doActs = async (report, actIndex, page) => {
+  // FUNCTION DEFINITION START
   // Quits and reports the job being aborted.
   const abortActs = async () => {
     // Add data on the aborted act to the report.
@@ -736,6 +737,7 @@ const doActs = async (report, actIndex, page) => {
     // Report this.
     console.log('ERROR: Job aborted');
   };
+  // FUNCTION DEFINITION END
   const {acts} = report;
   // If any more acts are to be performed:
   if (actIndex > -1 && actIndex < acts.length) {
@@ -855,11 +857,11 @@ const doActs = async (report, actIndex, page) => {
                 true, true, report, actIndex, 'ERROR: Navigation illicitly redirected'
               );
             }
-            // Otherwise, i.e. if the visit failed:
-            else {
-              // Report this and abort the job.
-              actIndex = await addError(true, true, report, actIndex, 'ERROR: Visit failed');
-            }
+          }
+          // Otherwise, i.e. if the visit failed:
+          else {
+            // Report this and abort the job.
+            actIndex = await addError(true, true, report, actIndex, 'ERROR: Visit failed');
           }
         }
         // Otherwise, if the act is a wait for text:

package/validation/validateTest.js

@@ -36,11 +36,14 @@ const {doJob} = require('../run');
 
 // Validates a test.
 exports.validateTest = async testID => {
+  // Get the job that validates the test.
   const jobFileNames = await fs.readdir(`${__dirname}/tests/jobs`);
   for (const jobFileName of jobFileNames.filter(fileName => fileName === `${testID}.json`)) {
     const jobJSON = await fs.readFile(`${__dirname}/tests/jobs/${jobFileName}`, 'utf8');
     const report = JSON.parse(jobJSON);
+    // Perform it.
     await doJob(report);
+    // Report whether the end time was reported.
     const {acts, jobData} = report;
     if (jobData.endTime && /^\d{4}-.+$/.test(jobData.endTime)) {
       console.log('Success: End time has been correctly populated');
@@ -48,19 +51,28 @@ exports.validateTest = async testID => {
     else {
       console.log('Failure: End time empty or invalid');
     }
+    // If the test acts were correctly reported:
     const testActs = acts.filter(act => act.type && act.type === 'test');
     if (
       testActs.length === report.acts.filter(act => act.type === 'test').length
-      && testActs.every(testAct => testAct.result && testAct.expectationFailures !== undefined)
+      && testActs.every(
+        testAct => testAct.standardResult && testAct.expectationFailures !== undefined
+      )
     ) {
+      // Report this.
       console.log('Success: Reports have been correctly populated');
+      // If all expectations were satisfied:
       if (testActs.every(testAct => testAct.expectationFailures === 0)) {
+        // Report this.
         console.log('######## Success: No failures\n');
       }
+      // Otherwise, i.e. if not all expectations were satisfied:
       else {
+        // Report this.
         console.log(
           '######## Failure: The test has at least one failure (see “"passed": false” below)\n'
         );
+        // Output the acts that had failures.
         console.log(
           JSON.stringify(
             acts.filter(act => act.type === 'test' && act.expectationFailures), null, 2