testaro 8.4.3 → 8.4.5

package/call.js

@@ -29,8 +29,10 @@ const reportDir = process.env.REPORTDIR;
 
 // Fulfills a high-level testing request.
 const callHigh = async jobID => {
-  await runJob(jobID);
-  console.log(`Job completed and report ${jobID}.json saved in ${reportDir}`);
+  const done = await runJob(jobID);
+  if (done) {
+    console.log(`Job completed and report ${jobID}.json saved in ${reportDir}`);
+  }
 };
 // Starts a watch.
 const callWatch = async (isDirWatch, isForever, interval) => {

package/high.js

@@ -41,13 +41,20 @@ exports.runJob = async jobID => {
       acts: [],
       jobData: {}
     };
-    // Run the job, adding the results to the report.
-    await doJob(report);
-    const reportJSON = JSON.stringify(report, null, 2);
-    await fs.writeFile(`${reportDir}/${jobID}.json`, reportJSON);
-    console.log(`Report ${jobID}.json recorded in ${process.env.REPORTDIR}`);
+    // If the initialized report is valid, run the job, adding the results to the report.
+    const done = await doJob(report);
+    if (done) {
+      const reportJSON = JSON.stringify(report, null, 2);
+      await fs.writeFile(`${reportDir}/${jobID}.json`, reportJSON);
+      console.log(`Report ${jobID}.json recorded in ${process.env.REPORTDIR}`);
+      return true;
+    }
+    else {
+      return false;
+    }
   }
   catch(error) {
     console.log(`ERROR running job (${error.message})\n${error.stack}`);
+    return false;
   }
 };

package/package.json

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

package/run.js

@@ -263,8 +263,8 @@ const isValidReport = report => {
       [commands[1].which, 'second command has which property'],
       [isURL(commands[1].which), 'second command which property has URL value'],
       [commands.every(command => isValidCommand(command)), 'every command is valid'],
-      [typeof sources.script === 'string', 'sources has script property with string value'],
-      [sources.host, 'sources has host property']
+      [sources && typeof sources.script === 'string', 'sources has script property with string value'],
+      [sources && sources.host, 'sources has host property']
     ];
     const invalidityIndex = criteria.findIndex(criterion => ! criterion[0]);
     if (invalidityIndex > -1) {
@@ -1560,8 +1560,10 @@ exports.doJob = async report => {
     const endTime = new Date();
     report.jobData.endTime = nowString();
     report.jobData.elapsedSeconds =  Math.floor((endTime - startTime) / 1000);
+    return true;
   }
   else {
     console.log('ERROR: Initialized job report invalid');
+    return false;
   }
 };