testilo 40.2.0 → 41.0.1

package/README.md

@@ -99,12 +99,7 @@ Targets can be specified in a more complex way, too. That allows you to create j
       what: 'Acme Clothes',
       url: 'https://acmeclothes.com/',
       actGroups: {
-        public: [
-          {
-            type: 'launch',
-            what: 'Acme Clothes home page',
-          }
-        ],
+        public: [],
         private: [
           {
             type: 'launch',
@@ -141,13 +136,13 @@ Targets can be specified in a more complex way, too. That allows you to create j
 
 As shown, a batch, unlike a target list, defines named groups of acts. They can be substituted for script placeholders, so various complex operations can be performed on each target.
 
-In this example, the `public` act group contains only 1 act, of type `launch`. A `launch` act in an act group is permitted to have only two properties, `what` and `url`. If either of these is omitted, its value is inherited from the corresponding property of the target. In the `public` act group in this case, the `what` value is specified, but the `url` value will be `https://acmeclothes.com/`, inherited from the target.
+In this example, the `public` act group contains no acts. The `private` act group contains 5 acts. A `launch` act in an act group is permitted to have only two properties, `what` and `url`. If either of these is omitted, its value is inherited from the corresponding property of the target.
 
 A batch is a JavaScript object. It can be converted to JSON and stored in a file.
 
 ### Target list to batch
 
-If you have a target list, the `batch` module of Testilo can convert it to a simple batch. The batch will contain, for each target, only one act group, named `main`, containing only a `launch` act. The target’s entry in the target list will determine the `what` and `url` properties of the target, and the `launch` acts will not override the values of those properties.
+If you have a target list, the `batch` module of Testilo can convert it to a simple batch. The batch will contain, for each target, only one act group, named `main`, containing no acts.
 
 #### Invocation
 
@@ -170,7 +165,7 @@ const batchObj = batch(id, what, targets);
 
 The `id` argument to `batch()` is an identifier for the target list. The `what` variable describes the target list. The `targets` variable is an array of arrays, with each array containing the 2 items (description and URL) defining one target.
 
-The `batch()` function of the `batch` module generates a batch and returns it as an object. Within the batch, each target is given a sequential (base-62 alphanumeric) string as an ID.
+The `batch()` function of the `batch` module generates a batch and returns it as an object. Within the batch, each target is given a sequential (base-36 alphanumeric) string as an ID.
 
 The invoking module can further dispose of the batch as needed.
 
@@ -288,7 +283,7 @@ In its simplest form, `script()` requires 3 string arguments:
 1. A description of the script
 1. A device ID
 
-Called in this way, `script()` produces a script that tells Testaro to perform the tests for all of the evaluation rules defined by all of the tools integrated by Testaro.
+Called in this way, `script()` produces a script that tells Testaro to perform the tests for all of the evaluation rules defined by all of the tools integrated by Testaro. In this case, the script launches a new Webkit browser before performing the tests of each tool.
 
 #### With options
 
@@ -384,6 +379,7 @@ When the `script` module creates a script for you, it does not ask you for all o
 - `sendReportTo`: `process.env.SEND_REPORT_TO`, or `''` if none
 - `sources.id`: script ID
 - `sources.requester`: `process.env.REQUESTER`, or `''` if none
+- test acts: `launch` = {}
 - `axe` test act: `detailLevel` = 2
 - `ibm` test act: `withItems` = `true`, `withNewContent` = `true`
 - `qualWeb` test act: `withNewContent` = `false`

package/batch.js

@@ -55,11 +55,7 @@ exports.batch = (id, what, targetList) => {
       batch.targets[target[0]] = {
         url: target[1],
         actGroups: {
-          main: [
-            {
-              type: 'launch'
-            }
-          ]
+          main: []
         }
       };
     });

package/merge.js

@@ -34,15 +34,6 @@ const {alphaNumOf, dateOf, getRandomString, getNowStamp} = require('./procs/util
 
 // ########## CONSTANTS
 
-// Tools that alter the page.
-const contaminantNames = new Set([
-  'alfa',
-  'aslint',
-  'axe',
-  'ed11y',
-  'htmlcs',
-  'testaro'
-]);
 // Length of the random merger ID.
 const mergeIDLength = 3;
 
@@ -85,12 +76,8 @@ exports.merge = (script, batch, executionTimeStamp) => {
         // Identify it as the current one.
         lastPlaceholder = act;
       }
-      // Otherwise, if it is a non-final target-modifying test act:
-      else if (
-        act.type === 'test'
-        && contaminantNames.has(act.which)
-        && actIndex < acts.length - 1
-      ) {
+      // Otherwise, if it is a test act:
+      else if (act.type === 'test') {
         // Change it to an array of itself and the current placeholder.
         acts[actIndex] = JSON.parse(JSON.stringify([act, lastPlaceholder]));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "40.2.0",
+  "version": "41.0.1",
   "description": "Prepares Testaro jobs and processes Testaro reports",
   "main": "call.js",
   "scripts": {

package/procs/util.js

@@ -34,9 +34,19 @@ const alphaNumChars = (() => {
   return digits.concat(lowers);
 })();
 // Tools.
-const toolIDs = exports.toolIDs = [
-  'alfa', 'aslint', 'axe', 'ed11y', 'htmlcs', 'ibm', 'nuVal', 'qualWeb', 'testaro', 'wave', 'wax'
-];
+exports.tools = {
+  alfa: 'Alfa',
+  aslint: 'ASLint',
+  axe: 'Axe',
+  ed11y: 'Editoria11y',
+  htmlcs: 'HTML CodeSniffer',
+  ibm: 'Accessibility Checker',
+  nuVal: 'Nu Html Checker',
+  qualWeb: 'QualWeb',
+  testaro: 'Testaro',
+  wave: 'WAVE',
+  wax: 'WallyAX'
+};
 
 // FUNCTIONS
 

package/script.js

@@ -32,7 +32,7 @@ require('dotenv').config();
 // Devices recognized by Playwright.
 const {devices} = require('playwright');
 // Utility module.
-const {isToolID, toolIDs} = require('./procs/util');
+const {isToolID, tools} = require('./procs/util');
 
 // ########## FUNCTIONS
 
@@ -142,7 +142,7 @@ exports.script = (id, what, deviceID, options = {}) => {
     // Otherwise, i.e. if options are not specified:
     else {
       // Populate the data on tools and rules.
-      toolIDs.forEach(toolID => {
+      Object.keys(tools).forEach(toolID => {
         toolsRulesData[toolID] = [];
       });
     }
@@ -151,7 +151,6 @@ exports.script = (id, what, deviceID, options = {}) => {
       id,
       what,
       strict: false,
-      isolate: true,
       standard: 'only',
       observe: false,
       device: {
@@ -171,14 +170,9 @@ exports.script = (id, what, deviceID, options = {}) => {
         script: id,
         batch: '',
         mergeID: '',
-        requester: process.env.REQUESTER || ''
+        requester: ''
       },
-        acts: [
-        {
-          type: 'placeholder',
-          which: 'main'
-        }
-      ]
+        acts: []
     };
     // Add the window options to the script.
     scriptObj.device.windowOptions = getWindowOptions(deviceID);
@@ -187,7 +181,9 @@ exports.script = (id, what, deviceID, options = {}) => {
       // Initialize a test act for it.
       const toolAct = {
         type: 'test',
-        which: toolID
+        launch: {},
+        which: toolID,
+        what: tools[toolID]
       };
       // If rules were specified:
       const ruleIDs = toolsRulesData[toolID];