testaro 30.0.0 → 30.0.2

package/package.json

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

package/procs/tellServer.js

@@ -17,13 +17,13 @@ exports.tellServer = (report, messageParams, logMessage) => {
   const whoParams = `agent=${agent}&jobID=${report.id || ''}`;
   const wholeURL = `${observer}?${whoParams}&${messageParams}`;
   const client = wholeURL.startsWith('https://') ? httpsClient : httpClient;
-  const request = client.request(wholeURL);
+  client.request(wholeURL)
   // If the notification threw an error:
-  request.on('error', error => {
+  .on('error', error => {
     // Report the error.
     const errorMessage = 'ERROR notifying the server';
     console.log(`${errorMessage} (${error.message})`);
-  });
-  request.end();
+  })
+  .end();
   console.log(`${logMessage} (server notified)`);
 };

package/tests/testaro.js

@@ -99,6 +99,14 @@ const jsonTest = async (ruleID, ruleArgs) => {
     withItems, all, ruleObj.ruleID, whats, ruleObj.ordinalSeverity, ruleObj.summaryTagName
   );
 };
+// Waits.
+const wait = ms => {
+  return new Promise(resolve => {
+    setTimeout(() => {
+      resolve('');
+    }, ms);
+  });
+};
 // Conducts and reports Testaro tests.
 exports.reporter = async (page, options) => {
   const {withItems, stopOnFail, granular, args} = options;
@@ -119,6 +127,8 @@ exports.reporter = async (page, options) => {
     && ['y', 'n'].includes(rules[0])
     && rules.slice(1).every(rule => evalRules[rule] || etcRules[rule])
   ) {
+    // Wait 1 second to prevent out-of-order logging with granular reporting.
+    await wait(1000);
     // For each rule invoked:
     const calledRules = rules[0] === 'y'
       ? rules.slice(1)

package/watch.js

@@ -59,11 +59,17 @@ const writeDirReport = async report => {
   }
 };
 // Archives a job.
-const archiveJob = async job => {
+const archiveJob = async (job, isFile) => {
+  // Save the job in the done subdirectory.
   const {id} = job;
   const jobJSON = JSON.stringify(job, null, 2);
+  await fs.mkdir(`${jobDir}/done`, {recursive: true});
   await fs.writeFile(`${jobDir}/done/${id}.json`, jobJSON);
-  await fs.rm(`${jobDir}/todo/${id}.json`);
+  // If the job had been saved as a file in the todo subdirectory:
+  if (isFile) {
+    // Delete the file.
+    await fs.rm(`${jobDir}/todo/${id}.json`);
+  }
 };
 // Checks for a directory job and, if found, performs and reports it, once or repeatedly.
 const checkDirJob = async (isForever, interval) => {
@@ -84,7 +90,7 @@ const checkDirJob = async (isForever, interval) => {
         // Report it.
         await writeDirReport(job);
         // Archive it.
-        await archiveJob(job);
+        await archiveJob(job, true);
         console.log(`Job ${id} archived in ${jobDir} (${nowString()})`);
         // If watching is repetitive:
         if (isForever) {
@@ -207,7 +213,7 @@ const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount
                       // Report it.
                       console.log(`${reportLogStart}${message}`);
                       // Archive the job.
-                      await archiveJob(contentObj);
+                      await archiveJob(contentObj, false);
                       console.log(`Job ${id} archived (${nowString()})`);
                       // Check the next server.
                       await checkNetJob(servers, serverIndex + 1, isForever, interval, 0);
@@ -228,7 +234,7 @@ const checkNetJob = async (servers, serverIndex, isForever, interval, noJobCount
                   catch(error) {
                     // Report it.
                     console.log(
-                      `ERROR: ${reportLogStart}status ${repResponse.statusCode} and response ${content.slice(0, 1000)}`
+                      `ERROR: ${reportLogStart}status ${repResponse.statusCode}, error message ${error.message}, and response ${content.slice(0, 1000)}`
                     );
                     // Check the next server, disregarding the failed job.
                     await checkNetJob(