testaro 41.0.2 → 42.0.0

package/README.md

@@ -143,17 +143,16 @@ Here is an example of a job:
   timeLimit: 80,
   creationTimeStamp: '241229T0537',
   executionTimeStamp: '250110T1200',
+  sendReportTo: 'https://abccorp.com/api/report',
+  target: {
+    what: 'Real Estate Management',
+    url: 'https://abccorp.com/mgmt/realproperty.html'
+  },
   sources: {
     script: 'ts99',
     batch: 'departments',
     mergeID: '7f',
-    sendReportTo: 'https://abccorp.com/api/report',
     requester: 'malavu@abccorp.com'
-    target: {
-      what: 'Real Estate Management',
-      url: 'https://abccorp.com/mgmt/realproperty.html'
-    },
-    lastTarget: false,
   },
   acts: [
     {
@@ -194,7 +193,9 @@ Job properties:
 - `timeLimit`: the number of seconds allowed for the execution of the job.
 - `creationTimeStamp`: a string in `yymmddThhMM` format, describing when the job was created.
 - `executionTimeStamp`: a string in `yymmddThhMM` format, specifying a date and time before which the job is not to be performed.
-- `sources`: an object describing the source of the job.
+- `sendReportTo`: the URL to which the job report is to be sent, or `''` if not a `netWatch` job.
+- `target`: data about the target of the job, or `{}` if the job involves multiple targets.
+- `sources`: data optionally inserted into the job by the job creator for use by the job creator.
 - `acts`: an array of the acts to be performed (documented below).
 
 ## Acts
@@ -237,7 +238,7 @@ When the texts of multiple elements of the same type will contain the same `whic
 
 #### Navigations
 
-An example of a **navigation** is the act of type `launch` above. The launch configuration is inherited from properties of the job, except that the act may override any of those properties.
+An example of a **navigation** is the act of type `launch` above. The launch configuration is inherited from the `deviceID`, `browserID`, `lowMotion`, and `target` properties of the job, except that the act may override any of those properties.
 
 If any act alters the page, you can restore the page to its original state for the next act by inserting a new `launch` act (and, if necessary, additional page-specific acts) between them.
 

package/call.js

@@ -83,7 +83,7 @@ const callRun = async jobIDStart => {
   // Otherwise, i.e. if the job does not exist.
   else {
     // Report the error.
-    console.log('ERROR: No specified job exists');
+    console.log('ERROR: Specified job does not exist');
   }
 };
 // Starts a directory watch, converting the interval argument to a number.

package/netWatch.js

@@ -142,8 +142,7 @@ exports.netWatch = async (isForever, intervalInSeconds, isCertTolerant = true) =
                 }
                 // Otherwise, i.e. if there was a job or a message:
                 else {
-                  const {id, message, sources} = contentObj;
-                  const sendReportTo = sources ? sources.sendReportTo : '';
+                  const {id, message, sendReportTo, sources} = contentObj;
                   // If the server sent a message, not a job:
                   if (message) {
                     // Report it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "41.0.2",
+  "version": "42.0.0",
   "description": "Run 1000 web accessibility tests from 10 tools and get a standardized report",
   "main": "index.js",
   "scripts": {

package/procs/job.js

@@ -196,6 +196,8 @@ exports.isValidJob = job => {
       timeLimit,
       creationTimeStamp,
       executionTimeStamp,
+      sendReportTo,
+      target,
       sources,
       acts
     } = job;
@@ -237,12 +239,13 @@ exports.isValidJob = job => {
     ) {
       return 'bad job executionTimeStamp';
     }
-    if (
-      ! sources
-      || typeof sources !== 'object'
-      || ! ['script', 'batch', 'target'].every(key => sources[key])
-      || ! ['what', 'url'].every(key => sources.target[key])
-    ) {
+    if (typeof sendReportTo !== 'string' || sendReportTo && ! isURL(sendReportTo)) {
+      return 'bad job sendReportTo';
+    }
+    if (typeof target !== 'object' || target.url && ! isURL(target.url) || target.what === '') {
+      return 'bad job target';
+    }
+    if (sources && typeof sources !== 'object') {
       return 'Bad job sources';
     }
     if (

package/run.js

@@ -622,7 +622,7 @@ const doActs = async (report, actIndex, page) => {
       // Launch the specified browser on the specified device and navigate to the specified URL.
       const launchResult = await launch(
         report,
-        act.url || report.sources.target.url,
+        act.url || report.target.url,
         debug,
         waits,
         act.deviceID || report.deviceID,