testaro 2.2.4 → 2.2.7

package/index.js

@@ -220,8 +220,9 @@ const isValidLog = log => Array.isArray(log) && ! log.length;
 // Validates an options object.
 const isValidOptions = async options => {
   if (options) {
-    const {script, batch, log, reports} = options;
-    return isValidScript(script)
+    const {id, script, batch, log, reports} = options;
+    return id
+    && isValidScript(script)
     && isValidBatch(batch)
     && isValidLog(log)
     && isValidReports(reports);
@@ -1130,20 +1131,20 @@ const doBatch = async (options, reportTemplate, hostIndex = 0) => {
         act.what = host.what;
       }
     });
-    // 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.orderName = options.id;
+    hostReport.id = `${options.id}-${host.id}`;
+    hostReport.orderUserName = options.userName;
+    hostReport.orderTime = options.orderTime;
+    hostReport.scriptName = options.scriptName;
+    hostReport.batchName = options.batchName;
+    hostReport.scriptIsValid = options.scriptIsValid;
+    hostReport.batchIsValid = options.batchIsValid;
     hostReport.host = host;
+    // Perform the commands on the host and add a report to the options object.
+    await doScript(options, hostReport);
     // Process the remaining hosts.
     await doBatch(options, reportTemplate, hostIndex + 1);
   }

package/package.json

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