testaro 2.2.1 → 2.2.2

package/index.js

@@ -1121,7 +1121,7 @@ const doBatch = async (options, reportTemplate, hostIndex = 0) => {
   const host = hosts[hostIndex];
   // If the specified host exists:
   if (host) {
-    // Copy the report for it.
+    // Create a report for it.
     const hostReport = JSON.parse(JSON.stringify(reportTemplate));
     // Copy the properties of the specified host to all url acts.
     hostReport.acts.forEach(act => {
@@ -1132,6 +1132,18 @@ const doBatch = async (options, reportTemplate, hostIndex = 0) => {
     });
     // Perform the commands on the host.
     await doScript(options, hostReport);
+    // Add the host’s ID to the host report.
+    hostReport.hostName = host.id;
+    // Add data from the template to the host report.
+    hostReport.orderName = reportTemplate.id;
+    hostReport.id = `${hostReport.orderName}-${host.id}`;
+    hostReport.orderUserName = reportTemplate.userName;
+    hostReport.orderTime = reportTemplate.orderTime;
+    hostReport.scriptName = reportTemplate.scriptName;
+    hostReport.batchName = reportTemplate.batchName;
+    hostReport.scriptIsValid = reportTemplate.scriptIsValid;
+    hostReport.batchIsValid = reportTemplate.batchIsValid;
+    hostReport.host = host;
     // Process the remaining hosts.
     await doBatch(options, reportTemplate, hostIndex + 1);
   }
@@ -1210,6 +1222,7 @@ exports.handleRequest = async options => {
     }
     // Create a report template, containing a copy of the commands as its acts.
     const reportTemplate = {
+      host: '',
       acts: JSON.parse(JSON.stringify(options.script.commands))
     };
     // Inject url acts where necessary to undo DOM changes.

package/package.json

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

package/validation/executors/tests.js

@@ -4,6 +4,10 @@
 const fs = require('fs').promises;
 const {handleRequest} = require(`${__dirname}/../../index`);
 const validateTests = async () => {
+  const totals = {
+    attempts: 0,
+    successes: 0
+  };
   const scriptFileNames = await fs.readdir(`${__dirname}/../tests/scripts`);
   for (const scriptFileName of scriptFileNames) {
     const rawScriptJSON = await fs
@@ -33,21 +37,28 @@ const validateTests = async () => {
           : true
       )
     ) {
+      totals.attempts++;
+      totals.successes++;
       console.log('Success: Reports have been correctly populated');
       if (reports[0].acts.every(
         act => act.type === 'test' ? act.result.failureCount === 0 : true
       )) {
+        totals.attempts++;
+        totals.successes++;
         console.log('Success: No failures');
       }
       else {
+        totals.attempts++;
         console.log('Failure: At least one test has at least one failure');
         console.log(JSON.stringify(reports, null, 2));
       }
     }
     else {
+      totals.attempts++;
       console.log('Failure: Reports empty or invalid');
       console.log(JSON.stringify(reports, null, 2));
     }
   }
+  console.log(`Grand totals: attempts ${totals.attempts}, successes ${totals.successes}`);
 };
 validateTests();