testaro 8.1.9 → 8.1.10

package/package.json

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

package/samples/{tp18.json → 00000-ts18-example.json}

@@ -1,5 +1,5 @@
 {
-  "id": "tp18",
+  "id": "00000-ts18-example",
   "what": "Alfa, Axe, Continuum, HTML CodeSniffer, IBM, Nu Html Checker, Tenon, WAVE, and 22 custom tests",
   "strict": true,
   "timeLimit": 500,
@@ -11,8 +11,9 @@
     },
     {
       "type": "url",
-      "which": "https://example.com/",
-      "what": "any page"
+      "which": "https://example.com",
+      "what": "Example.com",
+      "id": "example"
     },
     {
       "type": "tenonRequest",
@@ -35,8 +36,9 @@
     },
     {
       "type": "url",
-      "which": "https://example.com/",
-      "what": "any page"
+      "which": "https://example.com",
+      "what": "Example.com",
+      "id": "example"
     },
     {
       "type": "test",
@@ -213,5 +215,17 @@
       "id": "a",
       "what": "Tenon API version 2 result retrieval"
     }
-  ]
+  ],
+  "sources": {
+    "script": "ts18",
+    "batch": "",
+    "host": {
+      "id": "example",
+      "which": "https://example.com",
+      "what": "Example.com"
+    },
+    "requester": "user@domain.tld"
+  },
+  "jobCreationTime": "2022-11-12T22:51:45",
+  "timeStamp": "00000"
 }

package/validation/executors/high.js

@@ -8,46 +8,42 @@ const fs = require('fs/promises');
 // ########## CONSTANTS
 
 const projectRoot = `${__dirname}/../..`;
+process.env.JOBDIR = `${projectRoot}/validation/jobs`;
 process.env.REPORTDIR = `${projectRoot}/temp`;
 const reportDir = process.env.REPORTDIR;
+const jobID = '00000-simple-example';
 
 // ########## OPERATION
 
 // Run the simple job and write a report.
 const {runJob} = require(`${projectRoot}/high`);
-runJob('simple')
+runJob(jobID)
 .then(
   // When the report has been written:
   async () => {
-    // Open it.
-    const fileNames = await fs.readdir(reportDir);
-    const reportNames = fileNames.filter(name => name.endsWith('-simple.json'));
-    if (reportNames.length) {
-      try {
-        // Check its log and act lengths against expectations.
-        const reportJSON = await fs.readFile(`${reportDir}/${reportNames[0]}`);
-        const report = JSON.parse(reportJSON);
-        const {log, acts} = report;
-        if (log.length !== 2) {
-          console.log(
-            `Failure: log length is ${log.length} instead of 2 (see temp/${reportNames[0]}})`
-          );
-        }
-        else if (acts.length !== 3) {
-          console.log(
-            `Failure: acts length is ${acts.length} instead of 3 (see temp/${reportNames[0]}})`
-          );
-        }
-        else {
-          console.log(`Success (report is in temp/${reportNames[0]})`);
-        }
+    try {
+      // Check it against expectations.
+      const reportJSON = await fs.readFile(`${reportDir}/${jobID}.json`);
+      const report = JSON.parse(reportJSON);
+      const {job, acts, jobData} = report;
+      if (! job) {
+        console.log('Failure: Report omits job');
       }
-      catch(error) {
-        console.log(`ERROR: ${error.message}`);
+      else if (acts.length !== 3) {
+        console.log('Failure: Counts of acts is not 3');
+      }
+      else if (! jobData) {
+        console.log('Failure: Report omits jobData');
+      }
+      else if (jobData.endTime < jobData.startTime) {
+        console.log('Failure: End time precedes start time');
+      }
+      else {
+        console.log(`Success (report is in temp/${jobID}.json)`);
       }
     }
-    else {
-      console.log('ERROR: report not found');
+    catch(error) {
+      console.log(`ERROR: ${error.message}`);
     }
   },
   error => {

package/validation/jobs/00000-simple-example.json

@@ -0,0 +1,36 @@
+{
+  "id": "00000-simple-example",
+  "what": "Test example.com with bulk",
+  "strict": true,
+  "timeLimit": 10,
+  "commands": [
+    {
+      "type": "launch",
+      "which": "chromium",
+      "what": "Chromium browser"
+    },
+    {
+      "type": "url",
+      "which": "https://example.com/",
+      "what": "Example.com",
+      "id": "example"
+    },
+    {
+      "type": "test",
+      "which": "bulk",
+      "what": "count of visible elements"
+    }
+  ],
+  "sources": {
+    "script": "simple",
+    "batch": "",
+    "host": {
+      "id": "example",
+      "which": "https://example.com",
+      "what": "Example.com"
+    },
+    "requester": "user@domain.tld"
+  },
+  "jobCreationTime": "2022-11-12T22:51:45",
+  "timeStamp": "00000"
+}

package/samples/simple.json

@@ -1,23 +0,0 @@
-{
-  "id": "simple",
-  "what": "Test example.com with bulk",
-  "strict": true,
-  "timeLimit": 10,
-  "commands": [
-    {
-      "type": "launch",
-      "which": "chromium",
-      "what": "Chromium browser"
-    },
-    {
-      "type": "url",
-      "which": "https://example.com/",
-      "what": "page with a few accessibility defects"
-    },
-    {
-      "type": "test",
-      "which": "bulk",
-      "what": "bulk"
-    }
-  ]
-}