testaro 8.5.2 → 9.0.0

package/run.js

@@ -7,8 +7,8 @@
 
 // Module to keep secrets.
 require('dotenv').config();
-// Requirements for commands.
-const {commands} = require('./commands');
+// Requirements for acts.
+const {actSpecs} = require('./actSpecs');
 // Playwright package.
 const playwright = require('playwright');
 
@@ -18,7 +18,6 @@ const playwright = require('playwright');
 const debug = process.env.DEBUG === 'true';
 // Set WAITS environment variable to a positive number to insert delays (in ms).
 const waits = Number.parseInt(process.env.WAITS) || 0;
-const urlInject = process.env.URL_INJECT || 'yes';
 // CSS selectors for targets of moves.
 const moves = {
   button: 'button, [role=button], input[type=submit]',
@@ -68,20 +67,6 @@ const tests = {
   wave: 'WAVE',
   zIndex: 'z indexes'
 };
-// Tests that may change the DOM.
-const domChangers = new Set([
-  'axe',
-  'continuum',
-  'focAll',
-  'focInd',
-  'focOp',
-  'hover',
-  'htmlcs',
-  'ibm',
-  'menuNav',
-  'textNodes',
-  'wave'
-]);
 // Browser types available in PlayWright.
 const browserTypeNames = {
   'chromium': 'Chrome',
@@ -189,24 +174,24 @@ const hasSubtype = (variable, subtype) => {
     return true;
   }
 };
-// Validates a command.
-const isValidCommand = command => {
-  // Identify the type of the command.
-  const type = command.type;
+// Validates an act.
+const isValidAct = act => {
+  // Identify the type of the act.
+  const type = act.type;
   // If the type exists and is known:
-  if (type && commands.etc[type]) {
+  if (type && actSpecs.etc[type]) {
     // Copy the validator of the type for possible expansion.
-    const validator = Object.assign({}, commands.etc[type][1]);
+    const validator = Object.assign({}, actSpecs.etc[type][1]);
     // If the type is test:
     if (type === 'test') {
       // Identify the test.
-      const testName = command.which;
+      const testName = act.which;
       // If one was specified and is known:
       if (testName && tests[testName]) {
         // If it has special properties:
-        if (commands.tests[testName]) {
+        if (actSpecs.tests[testName]) {
           // Expand the validator by adding them.
-          Object.assign(validator, commands.tests[testName][1]);
+          Object.assign(validator, actSpecs.tests[testName][1]);
         }
       }
       // Otherwise, i.e. if no or an unknown test was specified:
@@ -215,22 +200,22 @@ const isValidCommand = command => {
         return false;
       }
     }
-    // Return whether the command is valid.
+    // Return whether the act is valid.
     return Object.keys(validator).every(property => {
       if (property === 'name') {
         return true;
       }
       else {
         const vP = validator[property];
-        const cP = command[property];
-        // If it is optional and omitted or present and valid:
-        const optAndNone = ! vP[0] && ! cP;
-        const isValidCommand = cP !== undefined && hasType(cP, vP[1]) && hasSubtype(cP, vP[2]);
-        return optAndNone || isValidCommand;
+        const aP = act[property];
+        // If it is optional and omitted or is present and valid:
+        const optAndNone = ! vP[0] && ! aP;
+        const isValidAct = aP !== undefined && hasType(aP, vP[1]) && hasSubtype(aP, vP[2]);
+        return optAndNone || isValidAct;
       }
     });
   }
-  // Otherwise, i.e. if the command has an unknown or no type:
+  // Otherwise, i.e. if the act has an unknown or no type:
   else {
     // Return invalidity.
     return false;
@@ -240,42 +225,60 @@ const isValidCommand = command => {
 const isValidReport = report => {
   if (report) {
     // Return whether the report is valid.
-    const {job, acts, jobData} = report;
-    const {id, what, strict, commands, sources, jobCreationTime, timeStamp} = job;
-    const criteria = [
-      [job, 'report has job property'],
-      [acts, 'report has acts property'],
-      [jobData, 'report has jobData property'],
-      [id, 'job has id property'],
-      [what, 'job has what property'],
-      [typeof strict === 'boolean', 'job has true or false strict property'],
-      [commands, 'job has commands property'],
-      [sources, 'job has sources property'],
-      [jobCreationTime, 'job has jobCreationTime property'],
-      [timeStamp, 'job has timeStamp property'],
-      [Array.isArray(acts), 'acts has array value'],
-      [typeof id === 'string', 'id has string value'],
-      [typeof what === 'string', 'what has string value'],
-      [Array.isArray(commands), 'commands has array value'],
-      [commands[0].type, 'first command has type property'],
-      [commands[0].type === 'launch', 'first command has launch type'],
-      [commands.length > 1, 'command count greater than 1'],
-      [commands[1].type, 'second command has type property'],
-      [commands[1].type === 'url', 'second command has url type'],
-      [commands[1].which, 'second command has which property'],
-      [isURL(commands[1].which), 'second command which property has URL value'],
-      [commands.every(command => isValidCommand(command)), 'every command is valid'],
-      [sources && typeof sources.script === 'string', 'sources has script property with string value'],
-      [sources && sources.host, 'sources has host property']
-    ];
-    const invalidityIndex = criteria.findIndex(criterion => ! criterion[0]);
-    if (invalidityIndex > -1) {
-      console.log(`ERROR: report fails “${criteria[invalidityIndex][1]}” requirement`);
+    const {id, what, strict, timeLimit, acts, sources, creationTime, timeStamp} = report;
+    if (! id || typeof id !== 'string') {
+      return 'Bad report ID';
     }
-    return invalidityIndex === -1;
+    if (! what || typeof what !== 'string') {
+      return 'Bad report what';
+    }
+    if (! strict || typeof strict !== 'boolean') {
+      return 'Bad report strict';
+    }
+    if (! timeLimit || typeof timeLimit !== 'number' || timeLimit < 1) {
+      return 'Bad report time limit';
+    }
+    if (! acts || ! Array.isArray(acts) || acts.length < 2) {
+      return 'Bad report acts';
+    }
+    if (! acts.every(act => act.type && typeof act.type === 'string')) {
+      return 'Act with no type';
+    }
+    if (acts[0].type !== 'launch') {
+      return 'First act type not launch';
+    }
+    if (acts[1].type !== 'url') {
+      return 'Second act type not url';
+    }
+    if (! ['chromium', 'webkit', 'firefox'].includes(acts[0].which)) {
+      return 'Bad first act which';
+    }
+    if (! acts[1].which || typeof acts[1].which !== 'string' || ! isURL(acts[1].which)) {
+      return 'Second act which not a URL';
+    }
+    if (acts.some(act => ! isValidAct(act))) {
+      return 'Not all acts valid';
+    }
+    if (! sources || typeof sources !== 'object') {
+      return 'Bad report sources';
+    }
+    if (typeof sources.script !== 'string') {
+      return 'Bad sources script';
+    }
+    if (
+      ! creationTime
+      || typeof creationTime !== 'string'
+      || ! /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/.test(creationTime)
+    ) {
+      return 'bad job creation time';
+    }
+    if (! timeStamp || typeof timeStamp !== 'string') {
+      return 'bad report timestamp';
+    }
+    return '';
   }
   else {
-    return false;
+    return 'no report';
   }
 };
 
@@ -608,10 +611,10 @@ const goTo = async (report, page, url, timeout, waitUntil, isStrict) => {
 const doActs = async (report, actIndex, page) => {
   // Quits and reports the performance being aborted.
   const abortActs = async () => {
-    // Add data on the aborted command to the report.
+    // Add data on the aborted act to the report.
     report.jobData.abortTime = nowString();
     report.jobData.abortedAct = actIndex;
-    // Prevent performance of additional commands.
+    // Prevent performance of additional acts.
     actIndex = -2;
     // Report this.
     console.log('ERROR: Job aborted');
@@ -625,18 +628,18 @@ const doActs = async (report, actIndex, page) => {
     }
   });
   const {acts} = report;
-  // If any more commands are to be performed:
+  // If any more acts are to be performed:
   if (actIndex > -1 && actIndex < acts.length) {
-    // Identify the command to be performed.
+    // Identify the act to be performed.
     const act = acts[actIndex];
     // If it is valid:
-    if (isValidCommand(act)) {
+    if (isValidAct(act)) {
       const whichSuffix = act.which ? ` (${act.which})` : '';
       console.log(`>>>> ${act.type}${whichSuffix}`);
-      // Increment the count of commands performed.
+      // Increment the count of acts performed.
       actCount++;
       act.startTime = Date.now();
-      // If the command is an index changer:
+      // If the act is an index changer:
       if (act.type === 'next') {
         const condition = act.if;
         const logSuffix = condition.length === 3 ? ` ${condition[1]} ${condition[2]}` : '';
@@ -655,7 +658,7 @@ const doActs = async (report, actIndex, page) => {
         };
         // If the condition is true:
         if (truth[1]) {
-          // If the performance of commands is to stop:
+          // If the performance of acts is to stop:
           if (act.jump === 0) {
             // Quit.
             actIndex = -2;
@@ -665,14 +668,14 @@ const doActs = async (report, actIndex, page) => {
             // Set the act index accordingly.
             actIndex += act.jump - 1;
           }
-          // Otherwise, if there is a named next command:
+          // Otherwise, if there is a named next act:
           else if (act.next) {
             // Set the new index accordingly, or stop if it does not exist.
             actIndex = acts.map(act => act.name).indexOf(act.next) - 1;
           }
         }
       }
-      // Otherwise, if the command is a launch:
+      // Otherwise, if the act is a launch:
       else if (act.type === 'launch') {
         // Launch the specified browser, creating a browser context and a page in it.
         await launch(report, act.which, act.lowMotion ? 'reduce' : 'no-preference');
@@ -681,13 +684,13 @@ const doActs = async (report, actIndex, page) => {
       }
       // Otherwise, if a current page exists:
       else if (page) {
-        // If the command is a url:
+        // If the act is a url:
         if (act.type === 'url') {
           // Identify the URL.
           const resolved = act.which.replace('__dirname', __dirname);
           requestedURL = resolved;
           // Visit it and wait until the network is idle.
-          const {strict} = report.job;
+          const {strict} = report;
           let response = await goTo(report, page, requestedURL, 15000, 'networkidle', strict);
           // If the visit fails:
           if (response.error) {
@@ -851,8 +854,10 @@ const doActs = async (report, actIndex, page) => {
         // Otherwise, if the page has a URL:
         else if (page.url() && page.url() !== 'about:blank') {
           const url = page.url();
-          // If redirection is permitted or did not occur:
-          if (! report.strict || deSlash(url) === deSlash(requestedURL)) {
+          // If redirection is inapplicable, is permitted, or did not occur:
+          if (
+            url.startsWith('file:') || ! report.strict || deSlash(url) === deSlash(requestedURL)
+          ) {
             // Add the URL to the act.
             act.url = url;
             // If the act is a revelation:
@@ -983,7 +988,7 @@ const doActs = async (report, actIndex, page) => {
               // Initialize the arguments.
               const args = [act.which === 'tenon' ? tenonData : page];
               // Identify the additional validator of the test.
-              const testValidator = commands.tests[act.which];
+              const testValidator = actSpecs.tests[act.which];
               // If it exists:
               if (testValidator) {
                 // Identify its argument properties.
@@ -1245,7 +1250,7 @@ const doActs = async (report, actIndex, page) => {
                   act.result.move = 'selected';
                   act.result.option = optionText;
                 }
-                // Otherwise, if it is entering text on a text- or search-input element:
+                // Otherwise, if it is entering text in an input element:
                 else if (['text', 'search'].includes(act.type)) {
                   act.result.attributes = {};
                   const {attributes} = act.result;
@@ -1458,7 +1463,7 @@ const doActs = async (report, actIndex, page) => {
             // Otherwise, i.e. if the act type is unknown:
             else {
               // Add the error result to the act.
-              addError(act, 'badType', 'ERROR: Invalid command type');
+              addError(act, 'badType', 'ERROR: Invalid act type');
             }
           }
           // Otherwise, i.e. if redirection is prohibited but occurred:
@@ -1480,88 +1485,37 @@ const doActs = async (report, actIndex, page) => {
       }
       act.endTime = Date.now();
     }
-    // Otherwise, i.e. if the command is invalid:
+    // Otherwise, i.e. if the act is invalid:
     else {
       // Quit and add error data to the report.
-      const errorMsg = `ERROR: Invalid command of type ${act.type}`;
+      const errorMsg = `ERROR: Invalid act of type ${act.type}`;
       console.log(errorMsg);
-      addError(act, 'badCommand', errorMsg);
+      addError(act, 'badAct', errorMsg);
       await abortActs();
     }
     // Perform any remaining acts if not aborted.
     await doActs(report, actIndex + 1, page);
   }
-  // Otherwise, if all commands have been performed and the job succeeded:
+  // Otherwise, if all acts have been performed and the job succeeded:
   else if (! report.jobData.abortTime) {
-    console.log('Commands completed');
+    console.log('Acts completed');
     await browserClose();
     console.log('Browser closed');
   }
 };
-// Injects launch and url acts into a report where necessary to undo DOM changes.
-const injectLaunches = acts => {
-  let injectMore = true;
-  while (injectMore) {
-    const injectIndex = acts.findIndex((act, index) =>
-      index < acts.length - 1
-      && act.type === 'test'
-      && acts[index + 1].type === 'test'
-      && domChangers.has(act.which)
-    );
-    if (injectIndex === -1) {
-      injectMore = false;
-    }
-    else {
-      const lastBrowserType = acts.reduce((browserType, act, index) => {
-        if (act.type === 'launch' && index < injectIndex) {
-          return act.which;
-        }
-        else {
-          return browserType;
-        }
-      }, '');
-      const lastURL = acts.reduce((url, act, index) => {
-        if (act.type === 'url' && index < injectIndex) {
-          return act.which;
-        }
-        else {
-          return url;
-        }
-      }, '');
-      acts.splice(
-        injectIndex + 1,
-        0,
-        {
-          type: 'launch',
-          which: lastBrowserType,
-          what: `${lastBrowserType} browser`
-        },
-        {
-          type: 'url',
-          which: lastURL,
-          what: 'URL'
-        }
-      );
-    }
-  }
-};
 /*
   Returns whether an initialized job report is valid and, if so, runs the job and adds the results
   to the report.
 */
 exports.doJob = async report => {
   // If the report is valid:
-  if(isValidReport(report)) {
-    // Add the job commands to the report as its initial acts.
-    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.
-    */
-    if (urlInject === 'yes') {
-      injectLaunches(report.acts);
-    }
+  const reportInvalidity = isValidReport(report);
+  if (reportInvalidity) {
+    console.log(reportInvalidity);
+  }
+  else {
     // Add initialized job data to the report.
+    report.jobData = {};
     const startTime = new Date();
     report.jobData.startTime = nowString();
     report.jobData.endTime = '';
@@ -1586,7 +1540,4 @@ 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/samples/00000-ts18-example.json

@@ -11,7 +11,7 @@
     },
     {
       "type": "url",
-      "which": "https://example.com",
+      "which": "https://example.edu",
       "what": "Example.com",
       "id": "example"
     },
@@ -36,7 +36,7 @@
     },
     {
       "type": "url",
-      "which": "https://example.com",
+      "which": "https://example.edu",
       "what": "Example.com",
       "id": "example"
     },
@@ -221,7 +221,7 @@
     "batch": "",
     "host": {
       "id": "example",
-      "which": "https://example.com",
+      "which": "https://example.edu",
       "what": "Example.com"
     },
     "requester": "user@domain.tld"

package/validation/executors/run.js

@@ -0,0 +1,40 @@
+// run.js
+// Validator for immediate job execution.
+
+// ########## IMPORTS
+
+const fs = require('fs/promises');
+
+// ########## CONSTANTS
+
+const {doJob} = require('../../run');
+const jobID = '00000-simple-example';
+
+// ########## OPERATION
+
+// Get the simple job.
+fs.readFile(`${__dirname}/../jobs/todo/${jobID}.json`, 'utf8')
+.then(async jobJSON => {
+  const report = JSON.parse(jobJSON);
+  // Run it.
+  await doJob(report);
+  try {
+    // Check the report against expectations.
+    const {acts, jobData} = report;
+    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');
+    }
+  }
+  catch(error) {
+    console.log(`ERROR: ${error.message}`);
+  }
+});

package/validation/executors/watchDir.js

@@ -10,18 +10,19 @@ const fs = require('fs/promises');
 // Override cycle environment variables with validation-specific ones.
 process.env.PROTOCOL = 'http';
 process.env.JOBDIR = `${__dirname}/../watch`;
-process.env.DONEDIR = `${__dirname}/../done`;
 process.env.REPORTDIR = `${__dirname}/../../temp`;
 const jobID = '00000-simple-example';
-const {cycle} = require(`${__dirname}/../../watch`);
+const {cycle} = require('../../watch');
 
 // Start checking for jobs every 5 seconds.
 cycle(true, false, 5)
 .then(() => {
-  console.log('Watch validation ended');
+  console.log('Success: Watch validation ended');
 });
-// Copy a job into JOBDIR after 7 seconds.
+// Make a job available after 7 seconds.
 setTimeout(() => {
-  fs.copyFile(`${__dirname}/../jobs/${jobID}.json`, `${process.env.JOBDIR}/${jobID}.json`);
-  console.log('Job copied into watched-job directory after 7 seconds');
+  fs.copyFile(
+    `${__dirname}/../jobs/todo/${jobID}.json`, `${process.env.JOBDIR}/todo/${jobID}.json`
+  );
+  console.log('Job made available after 7 seconds');
 }, 7000);

package/validation/executors/watchNet.js

@@ -9,11 +9,11 @@ const fs = require('fs/promises');
 
 // Override cycle environment variables with validation-specific ones.
 process.env.PROTOCOL = 'http';
-const jobDir = `${__dirname}/../jobs`;
+const jobDir = `${__dirname}/../jobs/todo`;
 process.env.JOB_URL = 'localhost:3007/api/job';
 process.env.REPORT_URL = 'localhost:3007/api';
 process.env.AGENT = 'testarauth';
-const {cycle} = require(`${__dirname}/../../watch`);
+const {cycle} = require('../../watch');
 const client = require(process.env.PROTOCOL);
 const jobID = '00000-simple-example';
 
@@ -81,11 +81,10 @@ const requestHandler = (request, response) => {
             const bodyJSON = bodyParts.join('');
             const body = JSON.parse(bodyJSON);
             if (
-              body.job
-              && body.acts
+              body.acts
               && body.jobData
-              && body.agent
-              && body.agent === process.env.AGENT
+              && body.jobData.agent
+              && body.jobData.agent === process.env.AGENT
             ) {
               ack.result = 'Success: Valid report submitted';
             }

package/validation/jobs/done/README.md

@@ -0,0 +1,3 @@
+# jobs
+
+Directory containing validated jobs.

package/validation/jobs/{00000-simple-example.json → todo/00000-simple-example.json}

@@ -1,9 +1,9 @@
 {
   "id": "00000-simple-example",
-  "what": "Test example.com with bulk",
+  "what": "Test example.edu with bulk",
   "strict": true,
   "timeLimit": 10,
-  "commands": [
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -11,7 +11,7 @@
     },
     {
       "type": "url",
-      "which": "https://example.com/",
+      "which": "https://example.edu/",
       "what": "Example.com",
       "id": "example"
     },
@@ -24,13 +24,12 @@
   "sources": {
     "script": "simple",
     "batch": "",
-    "host": {
+    "target": {
       "id": "example",
-      "which": "https://example.com",
-      "what": "Example.com"
+      "what": "Example"
     },
     "requester": "user@domain.tld"
   },
-  "jobCreationTime": "2022-11-12T22:51:45",
+  "creationTime": "2022-11-12T22:51:45",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/allHidden.json

@@ -2,7 +2,8 @@
   "id": "allHiddenVal",
   "what": "validation of allHidden test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -308,6 +309,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/bulk.json

@@ -2,7 +2,8 @@
   "id": "bulkVal",
   "what": "validation of bulk test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -42,6 +43,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/docType.json

@@ -2,7 +2,8 @@
   "id": "docTypeVal",
   "what": "validation of docType test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -40,6 +41,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/elements.json

@@ -2,7 +2,8 @@
   "id": "elementsVal",
   "what": "validation of elements test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -134,6 +135,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }