testilo 17.1.1 → 17.2.0

package/README.md

@@ -344,7 +344,9 @@ This is a valid Testaro job.
 
 If, however, you requested a merger **with** isolation, then Testilo would take cognizance of the fact that an `axe` test act is a target-modifying act. Testilo would therefore act as if another instance of the placeholder had been located in the script after the `axe` test act. So, copies of the same 6 acts that precede the `axe` test act would be inserted **after** the `axe` test act, too.
 
-Of the 8 tools providing tests for Testaro, 4 are target-modifying:
+Of the 9 tools providing tests for Testaro, 6 are target-modifying:
+- `alfa`
+- `aslint`
 - `axe`
 - `htmlcs`
 - `ibm`

package/batch.js

@@ -42,11 +42,8 @@ exports.batch = (id, what, targetList) => {
           acts: {
             main: [
               {
-                type: 'launch'
-              },
-              {
-                type: 'url',
-                which: target[2],
+                type: 'launch',
+                url: target[2],
                 what: target[1]
               }
             ]

package/merge.js

@@ -4,7 +4,8 @@
   Arguments:
     0. script
     1. batch
-    2. whether to provide test isolation (no if omitted)
+    2. requester
+    3. whether to provide test isolation (no if omitted)
 */
 
 // ########## IMPORTS
@@ -17,9 +18,12 @@ require('dotenv').config();
 const stdRequester = process.env.REQUESTER;
 // Tools that alter the page.
 const contaminantNames = new Set([
+  'alfa',
+  'aslint',
   'axe',
   'htmlcs',
-  'ibm'
+  'ibm',
+  'testaro'
 ]);
 
 // ########## FUNCTIONS
@@ -70,8 +74,7 @@ exports.merge = (script, batch, requester, isolate = false) => {
         act.type === 'test'
         && contaminantNames.has(act.which)
         && actIndex < acts.length - 1
-        && nextAct.type !== 'placeholder'
-        && (nextAct.type !== 'test')
+        && (nextAct.type === 'test')
       ) {
         acts[actIndex] = JSON.parse(JSON.stringify([act, lastPlaceholder]));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "17.1.1",
+  "version": "17.2.0",
   "description": "Prepares and processes Testaro reports",
   "main": "aim.js",
   "scripts": {