testaro 37.0.0 → 37.2.0

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "testaro",
-  "version": "37.0.0",
+  "version": "37.2.0",
   "description": "Run 1000 web accessibility tests from 10 tools and get a standardized report",
   "main": "index.js",
   "scripts": {
     "tests": "node validation/executors/tests",
     "test": "node validation/executors/test",
     "run": "node validation/executors/run",
-    "watchDir": "node validation/executors/watchDir",
-    "watchNet": "node validation/executors/watchNet"
+    "dirWatch": "node validation/executors/dirWatch",
+    "netWatch": "node validation/executors/netWatch"
   },
   "repository": {
     "type": "git",

package/validation/executors/{watchDir.js → dirWatch.js}

@@ -1,5 +1,5 @@
 /*
-  © 2022–2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2022–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
 */
 
 /*
-  watchDir.js
+  dirWatch.js
   Validator for directory watching.
 */
 
@@ -31,14 +31,14 @@ const fs = require('fs/promises');
 
 // CONSTANTS
 
-// Override cycle environment variables with validation-specific ones.
+// Override dirWatch environment variables with validation-specific ones.
 process.env.JOBDIR = `${__dirname}/../watch`;
 process.env.REPORTDIR = `${__dirname}/../../temp`;
-const jobID = '00000-simple-example';
-const {cycle} = require('../../watch');
+const jobID = '240101T1200-simple-example';
+const {dirWatch} = require('../../dirWatch');
 
 // Start checking for jobs every 5 seconds.
-cycle(true, false, 5)
+dirWatch(false, 5)
 .then(() => {
   console.log('Success: Watch validation ended');
 });

package/validation/executors/{watchNet.js → netWatch.js}

@@ -1,5 +1,5 @@
 /*
-  © 2022–2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2022–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -31,13 +31,13 @@ const fs = require('fs/promises');
 
 // CONSTANTS
 
-// Override cycle environment variables with validation-specific ones.
+// Override netWatch environment variables with validation-specific ones.
 const jobDir = `${__dirname}/../jobs/todo`;
-process.env.JOB_URL = 'http://localhost:3007/api/job';
+process.env.JOB_URLS = 'http://localhost:3007/api/job';
 process.env.AGENT = 'testarauth';
-const {cycle} = require('../../watch');
+const {netWatch} = require('../../netWatch');
 const client = require('http');
-const jobID = '00000-simple-example';
+const jobID = '240101T1200-simple-example';
 
 // OPERATION
 
@@ -47,7 +47,7 @@ const startTime = Date.now();
 let jobGiven = false;
 // Start checking for jobs every 5 seconds in 5 seconds.
 setTimeout(() => {
-  cycle(false, false, 5);
+  netWatch(false, 5, false);
 }, 5000);
 let server;
 // Handles Testaro requests to the server.
@@ -104,27 +104,27 @@ const requestHandler = (request, response) => {
             const body = JSON.parse(bodyJSON);
             if (
               body.acts
-              && body.jobData
-              && body.jobData.agent
-              && body.jobData.agent === process.env.AGENT
+              && body.sources
+              && body.sources.agent
+              && body.sources.agent === process.env.AGENT
             ) {
-              ack.result = 'Success: Valid report submitted';
+              ack.message = 'Success: Valid report submitted';
             }
             else {
-              ack.result = 'Failure: Report invalid';
+              ack.message = 'Failure: Report invalid';
             }
           }
           catch(error) {
-            ack.result = `ERROR: ${error.message}`;
+            ack.message = `ERROR: ${error.message}`;
           }
         }
       }
       else {
-        ack.result = 'ERROR: Report submission invalid';
+        ack.message = 'ERROR: Report submission invalid';
       }
       const ackJSON = JSON.stringify(ack);
       response.end(ackJSON);
-      console.log(`Server responded: ${ack.result}`);
+      console.log(`Server responded: ${ack.message}`);
       // This ends the validation, so stop the server.
       server.close();
       console.log('Server closed');

package/validation/executors/run.js

@@ -1,5 +1,5 @@
 /*
-  © 2022–2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2022–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -32,7 +32,7 @@ const fs = require('fs/promises');
 // ########## CONSTANTS
 
 const {doJob} = require('../../run');
-const jobID = '00000-simple-example';
+const jobID = '240101T1200-simple-example';
 
 // ########## OPERATION
 
@@ -45,8 +45,8 @@ fs.readFile(`${__dirname}/../jobs/todo/${jobID}.json`, 'utf8')
   try {
     // Check the report against expectations.
     const {acts, jobData} = report;
-    if (acts.length !== 3) {
-      console.log('Failure: Count of acts is not 3');
+    if (acts.length !== 2) {
+      console.log('Failure: Count of acts is not 2');
     }
     else if (! jobData) {
       console.log('Failure: Report omits jobData');

package/validation/executors/tests.js

@@ -1,5 +1,5 @@
 /*
-  © 2022–2023 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2022–2024 CVS Health and/or one of its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -32,15 +32,16 @@ const {validateTest} = require('../validateTest');
 
 // OPERATION
 
-// Get the names of the Testaro validation test files.
-fs.readdir(`${__dirname}/../tests/jobs`)
+// Get the names of the Testaro tes files.
+fs.readdir(`${__dirname}/../../testaro/`)
 // When they arrive:
 .then(async fileNames => {
   // For each file name:
   for (const fileName of fileNames) {
-    // Get the test ID from it by disregarding its .json extension.
-    const testID = fileName.slice(0, -5);
+    // Get the test ID from it by disregarding its extension.
+    const testID = fileName.replace(/\..+$/, '');
     // Validate the test.
+    console.log(`### Validating Testaro test ${testID}`);
     await validateTest(testID);
   }
 });

package/validation/jobs/todo/240101T1200-simple-example.json

@@ -0,0 +1,31 @@
+{
+  "id": "240101T1200-simple-example",
+  "what": "Test example.edu with bulk",
+  "strict": true,
+  "timeLimit": 10,
+  "acts": [
+    {
+      "type": "launch",
+      "which": "chromium",
+      "url": "https://example.edu/",
+      "what": "Chromium browser"
+    },
+    {
+      "type": "test",
+      "which": "testaro",
+      "withItems": false,
+      "stopOnFail": true,
+      "rules": [
+        "y",
+        "bulk"
+      ]
+    }
+  ],
+  "sources": {
+  },
+  "standard": "only",
+  "observe": false,
+  "sendReportTo": "http://localhost:3007/api",
+  "timeStamp": "240101T1500",
+  "creationTimeStamp": "240101T1200"
+}

package/validation/watch/done/240101T1200-simple-example.json

@@ -0,0 +1,30 @@
+{
+  "id": "240101T1200-simple-example",
+  "what": "Test example.edu with bulk",
+  "strict": true,
+  "timeLimit": 10,
+  "acts": [
+    {
+      "type": "launch",
+      "which": "chromium",
+      "url": "https://example.edu/",
+      "what": "Chromium browser"
+    },
+    {
+      "type": "test",
+      "which": "testaro",
+      "withItems": false,
+      "stopOnFail": true,
+      "rules": [
+        "y",
+        "bulk"
+      ]
+    }
+  ],
+  "sources": {},
+  "standard": "only",
+  "observe": false,
+  "timeStamp": "240101T1500",
+  "creationTimeStamp": "240101T1200",
+  "sendReportTo": ""
+}

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

@@ -1,39 +0,0 @@
-{
-  "id": "00000-simple-example",
-  "what": "Test example.edu with bulk",
-  "strict": true,
-  "timeLimit": 10,
-  "acts": [
-    {
-      "type": "launch",
-      "which": "chromium",
-      "what": "Chromium browser"
-    },
-    {
-      "type": "url",
-      "which": "https://example.edu/",
-      "what": "Example.com",
-      "id": "example"
-    },
-    {
-      "type": "test",
-      "which": "testaro",
-      "rules": [
-        "y",
-        "bulk"
-      ],
-      "withItems": false
-    }
-  ],
-  "sources": {
-    "script": "simple",
-    "batch": "",
-    "target": {
-      "id": "example",
-      "what": "Example"
-    },
-    "requester": "user@domain.tld"
-  },
-  "creationTime": "2022-11-12T22:51:45",
-  "timeStamp": "00000"
-}

package/validation/watch/done/00000-simple-example.json

@@ -1,39 +0,0 @@
-{
-  "id": "00000-simple-example",
-  "what": "Test example.edu with bulk",
-  "strict": true,
-  "timeLimit": 10,
-  "acts": [
-    {
-      "type": "launch",
-      "which": "chromium",
-      "what": "Chromium browser"
-    },
-    {
-      "type": "url",
-      "which": "https://example.edu/",
-      "what": "Example.com",
-      "id": "example"
-    },
-    {
-      "type": "test",
-      "which": "testaro",
-      "rules": [
-        "y",
-        "bulk"
-      ],
-      "withItems": false
-    }
-  ],
-  "sources": {
-    "script": "simple",
-    "batch": "",
-    "target": {
-      "id": "example",
-      "what": "Example"
-    },
-    "requester": "user@domain.tld"
-  },
-  "creationTime": "2022-11-12T22:51:45",
-  "timeStamp": "00000"
-}