testilo 19.0.1 → 19.0.2

package/README.md

@@ -362,10 +362,10 @@ A module can invoke `merge` in this way:
 
 ```javaScript
 const {merge} = require('testilo/merge');
-const jobs = merge(script, batch, requester, 'only', false, true);
+const jobs = merge(script, batch, requester, true, 'only', false);
 ```
 
-This invocation references `script`, `batch`, and `requester` variables that the module must have already defined. The `script` and `batch` variables are a script object and a batch object, respectively. The `requester` variable is an email address. The fourth argument is a string that specifies the Testaro standardization option ('also', 'only', or 'no'). The fifth argument is a boolean, specifying whether Testaro will allow granular network watching of the job. The sixth argument is a boolean, specifying whether to perform test isolation; a missing sixth argument is equivalent to `false`. The `merge()` function of the `merge` module generates jobs and returns them in an array. The invoking module can further dispose of the jobs as needed.
+This invocation references `script`, `batch`, and `requester` variables that the module must have already defined. The `script` and `batch` variables are a script object and a batch object, respectively. The `requester` variable is an email address. The fourth argument is a boolean, specifying whether to perform test isolation. The fifth argument is a string that specifies the Testaro standardization option ('also', 'only', or 'no'). The sixth argument is a boolean, specifying whether Testaro will allow granular network watching of the job. The `merge()` function of the `merge` module generates jobs and returns them in an array. The invoking module can further dispose of the jobs as needed.
 
 ##### By a user
 
@@ -374,15 +374,15 @@ A user can invoke `merge` in this way:
 - Create a script and save it as a JSON file in the `scripts` subdirectory of the `process.env.SPECDIR` directory.
 - Create a batch and save it as a JSON file in the `batches` subdirectory of the `process.env.SPECDIR` directory.
 - In the Testilo project directory, execute this statement:
-    - `node call merge s b e o g i t`
+    - `node call merge s b e i f g t`
 
 In these statements, replace:
 - `s` with the base name of the script file
 - `b` with the base name of the batch file
 - `e` with an email address, or with an empty string if the environment variable `process.env.REQUESTER` exists and you want to use it
-- `o` with `'also'`, `'only'`, or `'no'` to specify the Testaro standardization option
-- `g` with `true` if you want Testaro to allow granular network watching or `false` if not.
 - `i` with `true` if you want test isolation or `false` if not
+- `f` with `'also'`, `'only'`, or `'no'` to specify the treatment of standard-format results.
+- `g` with `true` if reporting is to be granular, or `false` if not.
 - `t` with `true` if the job is to be saved in the `todo` subdirectory or `false` if it is to be saved in the `pending` subdirectory of the `process.env.JOBDIR` directory.
 
 The `call` module will retrieve the named script and batch from their respective directories.

package/call.js

@@ -70,14 +70,22 @@ const callScript = async (scriptID, classificationID = null, ... issueIDs) => {
   console.log(`Script ${scriptID} created and saved in ${specDir}/scripts`);
 };
 // Fulfills a merging request.
-const callMerge = async (scriptID, batchID, requester, withIsolation, todo) => {
+const callMerge = async (
+  scriptID,
+  batchID,
+  requester,
+  withIsolation,
+  standard,
+  isGranular,
+  todo
+) => {
   // Get the script and the batch.
   const scriptJSON = await fs.readFile(`${specDir}/scripts/${scriptID}.json`, 'utf8');
   const script = JSON.parse(scriptJSON);
   const batchJSON = await fs.readFile(`${specDir}/batches/${batchID}.json`, 'utf8');
   const batch = JSON.parse(batchJSON);
   // Merge them into an array of jobs.
-  const jobs = merge(script, batch, requester, withIsolation);
+  const jobs = merge(script, batch, requester, withIsolation, standard, isGranular);
   // Save the jobs.
   const destination = todo === 'true' ? 'todo' : 'pending';
   for (const job of jobs) {
@@ -237,7 +245,7 @@ else if (fn === 'script' && fnArgs.length) {
     console.log('Execution completed');
   });
 }
-else if (fn === 'merge' && fnArgs.length === 5) {
+else if (fn === 'merge' && fnArgs.length === 7) {
   callMerge(... fnArgs)
   .then(() => {
     console.log('Execution completed');

package/merge.js

@@ -5,9 +5,9 @@
     0. script
     1. batch
     2. requester
-    3. value of the standard property
-    4. value of the granularity property
-    5. whether to provide test isolation (no if omitted)
+    3. whether to provide test isolation
+    4. value of the standard property
+    5. whether reporting is to be granular
 */
 
 // ########## IMPORTS
@@ -31,7 +31,7 @@ const contaminantNames = new Set([
 // ########## FUNCTIONS
 
 // Merges a script and a batch and returns jobs.
-exports.merge = (script, batch, requester, standard, granular, isolate = false) => {
+exports.merge = (script, batch, requester, isolate, standard, isGranular) => {
   if (isolate === 'false') {
     isolate = false;
   }
@@ -61,7 +61,7 @@ exports.merge = (script, batch, requester, standard, granular, isolate = false)
   protoJob.creationTime = creationTime;
   protoJob.timeStamp = timeStamp;
   protoJob.standard = standard || 'only';
-  protoJob.observe = granular || false;
+  protoJob.observe = isGranular || false;
   // If isolation was requested:
   if (isolate) {
     // Perform it.

package/package.json

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