testaro 32.0.11 → 32.1.0

package/README.md

@@ -1,25 +1,3 @@
-/*
-  © 2021–2023 CVS Health and/or one of its affiliates. All rights reserved.
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-*/
-
 # testaro
 
 Ensemble testing for web accessibility
@@ -775,12 +753,13 @@ The Testilo package contains functions that can create jobs from scripts and add
 ##### By a user
 
 ```bash
+node call run
 node call run be76p
 ```
 
-In this example, `be76p` is the initial characters of the ID of a job saved as a JSON file in the `todo` subdirectory of the `process.env.JOBDIR` directory.
+In the second example, `be76p` is the initial characters of the ID of a job saved as a JSON file in the `todo` subdirectory of the `process.env.JOBDIR` directory.
 
-The `call` module will find the first job file with a matching name, execute the `doJob` function of the `run` module on the job, save the report in the `raw` subdirectory of the `process.env.REPORTDIR` directory, and archive the job file in the `done` subdirectory of the `process.env.JOBDIR` directory.
+The `call` module will find the first job file with a matching name if an argument is given, or the first job file if not. Then the module will execute the `doJob` function of the `run` module on the job, save the report in the `raw` subdirectory of the `process.env.REPORTDIR` directory, and archive the job file in the `done` subdirectory of the `process.env.JOBDIR` directory.
 
 #### Watch
 
@@ -952,3 +931,25 @@ Work on the custom tests in this package began in 2017, and work on the multi-pa
 ## Etymology
 
 “Testaro” means “collection of tests” in Esperanto.
+
+/*
+  © 2021–2023 CVS Health and/or one of its affiliates. All rights reserved.
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/

package/call.js

@@ -58,7 +58,9 @@ const rawDir = `${reportDir}/raw`;
 const callRun = async jobIDStart => {
   // Find the job.
   const jobDirFileNames = await fs.readdir(todoDir);
-  const jobFileName = jobDirFileNames.find(fileName => fileName.startsWith(jobIDStart));
+  const jobFileName = jobIDStart
+  ? jobDirFileNames.find(fileName => fileName.startsWith(jobIDStart))
+  : jobDirFileNames[0];
   // If it exists:
   if (jobFileName) {
     // Get it.
@@ -90,8 +92,8 @@ const callNetWatch = async(isForever, interval) => {
 // OPERATION
 
 // Execute the requested function.
-if (fn === 'run' && fnArgs.length === 1) {
-  callRun(fnArgs)
+if (fn === 'run' && fnArgs.length < 2) {
+  callRun(fnArgs[0])
   .then(() => {
     console.log('Execution completed\n');
     process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "32.0.11",
+  "version": "32.1.0",
   "description": "Run 960 web accessibility tests from 9 tools and get a standardized report",
   "main": "index.js",
   "scripts": {

package/tests/wave.js

@@ -50,7 +50,7 @@ exports.reporter = async (page, options) => {
           try {
             // Delete unnecessary properties.
             const actResult = JSON.parse(actReport);
-            const {categories} = actResult;
+            const {categories, statistics} = actResult;
             delete categories.feature;
             delete categories.structure;
             delete categories.aria;
@@ -83,6 +83,16 @@ exports.reporter = async (page, options) => {
                 items[issueName].wcag = guidelines;
               });
             });
+            // Add important data to the result.
+            if (statistics) {
+              data.pageTitle = statistics.pagetitle || '';
+              data.pageURL = statistics.pageurl || '';
+              data.time = statistics.time || null;
+              data.creditsRemaining = statistics.creditsremaining || null;
+              data.allItemCount = statistics.allitemcount || null;
+              data.totalElements = statistics.totalelements || null;
+            }
+            // Return the result.
             return resolve(actResult);
           }
           catch (error) {