testaro 5.2.0 → 5.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "description": "Automation of accessibility testing",
   "main": "index.js",
   "scripts": {

package/run.js

@@ -633,6 +633,12 @@ const wait = ms => {
 };
 // Recursively performs the acts in a report.
 const doActs = async (report, actIndex, page) => {
+  process.on('message', message => {
+    if (message === 'interrupt') {
+      console.log('ERROR: Terminal interrupted doActs');
+      process.exit();
+    }
+  });
   const {acts} = report;
   // If any more commands are to be performed:
   if (actIndex > -1 && actIndex < acts.length) {
@@ -1310,8 +1316,7 @@ const doScript = async (report) => {
 const injectLaunches = acts => {
   let injectMore = true;
   while (injectMore) {
-    const injectIndex = acts.findIndex(
-      (act, index) =>
+    const injectIndex = acts.findIndex((act, index) =>
       index < acts.length - 1
       && act.type === 'test'
       && acts[index + 1].type === 'test'

package/runHost.js

@@ -0,0 +1,36 @@
+/*
+  runHost.js
+  Runs a host job and writes a report file.
+*/
+
+// ########## IMPORTS
+
+// Module to keep secrets.
+require('dotenv').config();
+// Module to read and write files.
+const fs = require('fs/promises');
+const {handleRequest} = require('./run');
+
+// ########## CONSTANTS
+const reportDir = process.env.REPORTDIR;
+
+// ########## FUNCTIONS
+
+// Runs one script and writes a report file.
+const runHost = async (id, scriptJSON, hostJSON) => {
+  const report = {
+    id,
+    host: JSON.parse(hostJSON),
+    log: [],
+    script: JSON.parse(scriptJSON),
+    acts: []
+  };
+  await handleRequest(report);
+  const reportJSON = JSON.stringify(report, null, 2);
+  await fs.writeFile(`${reportDir}/${id}.json`, reportJSON);
+  process.disconnect();
+  process.exit();
+};
+
+// ########## OPERATION
+runHost(... process.argv.slice(2));

package/tests/hover.js

@@ -30,20 +30,7 @@
 
 // CONSTANTS
 
-// Initialize the result.
-const data = {
-  totals: {
-    triggers: 0,
-    headTriggers: 0,
-    tailTriggers: 0,
-    impactTriggers: 0,
-    additions: 0,
-    removals: 0,
-    opacityChanges: 0,
-    opacityImpact: 0,
-    unhoverables: 0
-  }
-};
+const data = {};
 
 // FUNCTIONS
 
@@ -171,7 +158,10 @@ const find = async (withItems, page, region, sample, popRatio) => {
             position: {
               x: 0,
               y: 0
-            }
+            },
+            timeout: 500,
+            force: true,
+            noWaitAfter: true
           });
           // Wait for any delayed and/or slowed hover reaction.
           await page.waitForTimeout(200);
@@ -218,6 +208,18 @@ const find = async (withItems, page, region, sample, popRatio) => {
 exports.reporter = async (
   page, headSize = 0, headSampleSize = -1, tailSampleSize = -1, withItems
 ) => {
+  // Initialize the result.
+  data.totals = {
+    triggers: 0,
+    headTriggers: 0,
+    tailTriggers: 0,
+    impactTriggers: 0,
+    additions: 0,
+    removals: 0,
+    opacityChanges: 0,
+    opacityImpact: 0,
+    unhoverables: 0
+  };
   // If details are to be reported:
   if (withItems) {
     // Add properties for details to the initialized result.

package/tests/htmlcs.js

@@ -21,14 +21,14 @@ exports.reporter = async page => {
       const nextIssues = await page.evaluate(standard => {
         let issues = null;
         try {
-          issues = HTMLCS_RUNNER.run(standard);
+          issues = window['HTMLCS_RUNNER'].run(standard);
         }
         catch(error) {
           console.log(`ERROR executing HTMLCS_RUNNER on ${document.URL} (${error.message})`);
-        };
+        }
         return issues;
       }, standard);
-      if (nextIssues) {
+      if (nextIssues && nextIssues.every(issue => typeof issue === 'string')) {
         messageStrings.push(... nextIssues);
       }
       else {
@@ -36,7 +36,7 @@ exports.reporter = async page => {
         result.error = 'ERROR executing HTMLCS_RUNNER in the page';
         break;
       }
-    };
+    }
     if (! result.prevented) {
       // Sort the issues by class and standard.
       messageStrings.sort();

package/tests/ibm.js

@@ -104,7 +104,7 @@ exports.reporter = async (page, withItems, withNewContent) => {
     result.content = await doTest(typeContent, withItems, timeLimit);
     if (result.content.prevented) {
       result.prevented = true;
-      console.log('ERROR: Getting ibm test report from page took too long');
+      console.log(`ERROR: Getting ibm test report from page timed out at ${timeLimit} seconds`);
     }
   }
   // If a test with new content is to be performed:
@@ -114,7 +114,7 @@ exports.reporter = async (page, withItems, withNewContent) => {
     result.url = await doTest(typeContent, withItems, timeLimit);
     if (result.url.prevented) {
       result.prevented = true;
-      console.log('ERROR: Getting ibm test report from URL took too long');
+      console.log(`ERROR: Getting ibm test report from URL timed out at ${timeLimit} seconds`);
     }
   }
   await close();

package/tests/tabNav.js

@@ -103,7 +103,9 @@ exports.reporter = async (page, withItems) => {
         });
       })
       .catch(error => {
-        console.log(`ERROR: could not click tab element ${itemData.text} (${error.message})`);
+        console.log(
+          `ERROR clicking tab element ${itemData.text} (${error.message.replace(/\n.+/s, '')})`
+        );
       pressed = false;
       });
       // Increment the counts of navigations and key navigations.