testilo 9.0.0 → 9.0.2

package/README.md

@@ -343,7 +343,7 @@ node call score sp25a 75
 ```
 
 When a user invokes `score` in this example, the `call` module:
-- gets the scoring module `sp25a` from its JSON file `sp25a.json` in the `process.env.SCOREPROCDIR` directory
+- gets the scoring module `sp25a` from its JSON file `sp25a.json` in the `score` subdirectory of the `process.env.FUNCTIONDIR` directory
 - gets the reports from the r`raw` subdirectory of the `process.env.REPORTDIR` directory
 - writes the scored reports to the `scored` subdirectory of the `process.env.REPORTDIR` directory
 

package/call.js

@@ -75,7 +75,7 @@ const getReports = async (type, selector = '') => {
 // Fulfills a scoring request.
 const callScore = async (scorerID, selector = '') => {
   // Get the raw reports to be scored.
-  const reports = getReports('raw', selector);
+  const reports = await getReports('raw', selector);
   // If any exist:
   if (reports.length) {
     // Get the scorer.

package/merge.js

@@ -15,6 +15,7 @@ require('dotenv').config();
 // ########## CONSTANTS
 
 const stdRequester = process.env.REQUESTER;
+// Tests that alter the page.
 const contaminantNames = new Set([
   'axe',
   'continuum',
@@ -28,6 +29,10 @@ const contaminantNames = new Set([
   'textNodes',
   'wave'
 ]);
+// Tests that are immune to page alteration.
+const immuneNames = new Set([
+  'tenon'
+]);
 
 // ########## FUNCTIONS
 
@@ -61,12 +66,13 @@ exports.merge = (script, batch, requester, isolate = false) => {
   protoJob.timeStamp = timeStamp;
   // If isolation was requested:
   if (isolate) {
-    // Append a copy of the previous placeholder to each eligible contaminating test in the script.
+    // Perform it.
     let {acts} = protoJob;
     let lastPlaceholder = {};
     for (const actIndexString in acts) {
       const actIndex = Number.parseInt(actIndexString);
       const act = acts[actIndex];
+      const nextAct = acts[actIndex + 1];
       if (act.type === 'placeholder') {
         lastPlaceholder = act;
       }
@@ -74,7 +80,8 @@ exports.merge = (script, batch, requester, isolate = false) => {
         act.type === 'test'
         && contaminantNames.has(act.which)
         && actIndex < acts.length - 1
-        && acts[actIndex + 1].type !== 'placeholder'
+        && nextAct.type !== 'placeholder'
+        && (nextAct.type !== 'test' || ! immuneNames.has(nextAct.which))
       ) {
         acts[actIndex] = JSON.parse(JSON.stringify([act, lastPlaceholder]));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "description": "Client that scores and digests Testaro reports",
   "main": "aim.js",
   "scripts": {