testaro 8.1.0 → 8.1.2

package/README.md

@@ -251,7 +251,7 @@ A report object is saved as a JSON file in the `process.env.REPORTDIR_RAW` direc
       },
       requester: 'user@domain.org'
     },
-    jobCreationTime: '2023-05-26T14:28',
+    jobCreationTime: '2023-05-26T14:28:22',
     timeStamp: 'be76p'
   },
   acts: [],

package/call.js

@@ -39,7 +39,6 @@ const callWatch = async (isDirWatch, isForever, interval) => {
     `Starting a ${isForever === 'true' ? 'repeating' : 'one-time'} ${isDirWatch === 'true' ? 'directory' : 'network'} watch`
   );
   await cycle(isDirWatch === 'true', isForever === 'true', Number.parseInt(interval, 10));
-  console.log('Watching ended');
 };
 
 // ########## OPERATION

package/high.js

@@ -38,7 +38,8 @@ exports.runJob = async jobID => {
     // Initialize a report for the job.
     const report = {
       job,
-      acts: []
+      acts: [],
+      jobData: {}
     };
     // Run the job, adding the results to the report.
     await doJob(report);

package/package.json

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

package/run.js

@@ -236,21 +236,31 @@ const isValidCommand = command => {
 // Validates a report object.
 const isValidReport = report => {
   if (report) {
-    // Return whether the report is valid.
-    const {script, acts} = report;
-    const {what, strict, commands} = script;
-    return what
-      && typeof strict === 'boolean'
-      && commands
-      && typeof what === 'string'
-      && Array.isArray(commands)
-      && commands[0].type === 'launch'
-      && commands.length > 1
-      && commands[1].type === 'url'
-      && isURL(commands[1].which)
-      && commands.every(command => isValidCommand(command))
-      && Array.isArray(acts)
-      && ! acts.length;
+    // Return whether the job is valid.
+    const {job, acts, jobData} = report;
+    const {id, what, strict, commands, sources, jobCreationTime, timeStamp} = job;
+    const isValid = job
+    && acts
+    && jobData
+    && id
+    && what
+    && typeof strict === 'boolean'
+    && commands
+    && sources
+    && jobCreationTime
+    && timeStamp
+    && Array.isArray(acts)
+    && typeof id === 'string'
+    && typeof what === 'string'
+    && Array.isArray(commands)
+    && commands[0].type === 'launch'
+    && commands.length > 1
+    && commands[1].type === 'url'
+    && isURL(commands[1].which)
+    && commands.every(command => isValidCommand(command))
+    && sources.script
+    && sources.host;
+    return isValid;
   }
   else {
     return false;
@@ -651,7 +661,7 @@ const doActs = async (report, actIndex, page) => {
           const resolved = act.which.replace('__dirname', __dirname);
           requestedURL = resolved;
           // Visit it and wait until the network is idle.
-          const {strict} = report.script;
+          const {strict} = report.job;
           let response = await goTo(report, page, requestedURL, 15000, 'networkidle', strict);
           // If the visit fails:
           if (response.error) {
@@ -1504,7 +1514,7 @@ exports.doJob = async report => {
   // If the report is valid:
   if(isValidReport(report)) {
     // Add the script commands to the report as its initial acts.
-    report.acts = JSON.parse(JSON.stringify(report.script.commands));
+    report.acts = JSON.parse(JSON.stringify(report.job.commands));
     /*
       Inject launch and url acts where necessary to undo DOM changes, if specified.
       Injection of url acts alone does not guarantee test independence.
@@ -1514,24 +1524,22 @@ exports.doJob = async report => {
     }
     // Add initialized job data to the report.
     const startTime = new Date();
-    report.jobData = {
-      startTime: nowString(),
-      endTime: '',
-      elapsedSeconds: 0,
-      visitLatency: 0,
-      logCount: 0,
-      logSize: 0,
-      errorLogCount: 0,
-      errorLogSize: 0,
-      prohibitedCount: 0,
-      visitTimeoutCount: 0,
-      visitRejectionCount: 0,
-      aborted: false,
-      abortedAct: null,
-      presses: 0,
-      amountRead: 0,
-      testTimes: []
-    };
+    report.jobData.startTime = nowString();
+    report.jobData.endTime = '';
+    report.jobData.elapsedSeconds = 0;
+    report.jobData.visitLatency = 0;
+    report.jobData.logCount = 0;
+    report.jobData.logSize = 0;
+    report.jobData.errorLogCount = 0;
+    report.jobData.errorLogSize = 0;
+    report.jobData.prohibitedCount = 0;
+    report.jobData.visitTimeoutCount = 0;
+    report.jobData.visitRejectionCount = 0;
+    report.jobData.aborted = false;
+    report.jobData.abortedAct = null;
+    report.jobData.presses = 0;
+    report.jobData.amountRead = 0;
+    report.jobData.testTimes = [];
     // Recursively perform the specified acts.
     await doActs(report, 0, null);
     // Add the end time and duration to the report.
@@ -1539,4 +1547,7 @@ exports.doJob = async report => {
     report.jobData.endTime = nowString();
     report.jobData.elapsedSeconds =  Math.floor((endTime - startTime) / 1000);
   }
+  else {
+    console.log('ERROR: Initialized job report invalid');
+  }
 };

package/watch.js

@@ -85,11 +85,11 @@ const checkNetJob = async () => {
 };
 // Writes a directory report.
 const writeDirReport = async report => {
-  const scriptID = report && report.script && report.script.id;
-  if (scriptID) {
+  const jobID = report && report.job && report.job.id;
+  if (jobID) {
     try {
       const reportJSON = JSON.stringify(report, null, 2);
-      const reportName = `${scriptID}.json`;
+      const reportName = `${jobID}.json`;
       await fs.writeFile(`${reportDir}/${reportName}`, reportJSON);
       console.log(`Report ${reportName} saved`);
       return true;
@@ -99,6 +99,10 @@ const writeDirReport = async report => {
       return false;
     }
   }
+  else {
+    console.log('ERROR: Job has no ID');
+    return false;
+  }
 };
 // Submits a network report.
 const writeNetReport = async report => {
@@ -130,10 +134,10 @@ const writeNetReport = async report => {
   return ack;
 };
 // Archives a job.
-const archiveJob = async script => {
-  const scriptJSON = JSON.stringify(script, null, 2);
-  await fs.writeFile(`${doneDir}/${script.id}.json`, scriptJSON);
-  await fs.rm(`${jobDir}/${script.id}.json`);
+const archiveJob = async job => {
+  const jobJSON = JSON.stringify(job, null, 2);
+  await fs.writeFile(`${doneDir}/${job.id}.json`, jobJSON);
+  await fs.rm(`${jobDir}/${job.id}.json`);
 };
 // Waits.
 const wait = ms => {
@@ -144,15 +148,15 @@ const wait = ms => {
   });
 };
 // Runs a job and returns a report.
-exports.runJob = async (script, isDirWatch) => {
-  const {id} = script;
+exports.runJob = async (job, isDirWatch) => {
+  const {id} = job;
   if (id) {
     try {
       // Initialize a report.
       const report = {
-        log: [],
-        script,
-        acts: []
+        job,
+        acts: [],
+        jobData: {}
       };
       // Run the job, adding to the report.
       await doJob(report);
@@ -218,7 +222,7 @@ exports.cycle = async (isDirWatch, isForever, interval) => {
         if (isDirWatch) {
           // Archive the job.
           await archiveJob(job);
-          console.log(`Script ${job.id} archived`);
+          console.log(`Job ${job.id} archived`);
         }
         // If watching was specified for only 1 job, stop.
         statusOK = isForever;