testaro 4.12.0 → 4.13.0

package/aceconfig.js

@@ -2,5 +2,5 @@ module.exports = {
   reportLevels: [
     'violation',
     'recommendation'
-  ],
+  ]
 };

package/high.js

@@ -1,7 +1,7 @@
 /*
   high.js
   Invokes Testaro with the high-level method.
-  Usage example: node high tp10 weborgs
+  Usage example: node high tp11 weborgs
 */
 
 const {runJob} = require('./create');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "4.12.0",
+  "version": "4.13.0",
   "description": "Automation of accessibility testing",
   "main": "index.js",
   "scripts": {

package/run.js

@@ -2,12 +2,16 @@
   index.js
   testaro main script.
 */
+
 // ########## IMPORTS
+
 // Module to keep secrets.
 require('dotenv').config();
 // Requirements for commands.
 const {commands} = require('./commands');
+
 // ########## CONSTANTS
+
 // Set DEBUG environment variable to 'true' to add debugging features.
 const debug = process.env.DEBUG === 'true';
 // Set WAITS environment variable to a positive number to insert delays (in ms).
@@ -66,18 +70,21 @@ const tenonData = {
 };
 // Keywords in log messages indicating errors.
 const errorWords = [
-  'failed',
+  'content security policy',
+  'deprecated',
   'error',
-  'suspicious',
+  'failed',
+  'missing',
+  'but not used',
   'refused',
-  'content security policy',
-  'unrecognized',
   'requires',
-  'warning',
-  'missing',
-  'deprecated'
+  'suspicious',
+  'unrecognized',
+  'warning'
 ];
+
 // ########## VARIABLES
+
 // Facts about the current session.
 let logCount = 0;
 let logSize = 0;
@@ -91,7 +98,11 @@ let actCount = 0;
 let browserContext;
 let browserTypeName;
 let requestedURL = '';
+// All browsers launched.
+let browsers = [];
+
 // ########## VALIDATORS
+
 // Validates a browser type.
 const isBrowserType = type => ['chromium', 'firefox', 'webkit'].includes(type);
 // Validates a load state.
@@ -234,12 +245,17 @@ const isValidReport = async report => {
     return false;
   }
 };
+
 // ########## OTHER FUNCTIONS
-// Closes any existing browser.
-const closeBrowser = async () => {
-  const browser = browserContext && browserContext.browser();
-  if (browser) {
-    await browser.close();
+
+// Closes all existing browsers.
+const closeBrowsers = async () => {
+  for (const browserObj of browsers) {
+    const {browser, typeName} = browserObj;
+    if (browser) {
+      console.log(`Closing ${typeName} browser, version ${browser.version()}`);
+      await browser.close();
+    }
   }
 };
 // Launches a browser.
@@ -248,7 +264,7 @@ const launch = async typeName => {
   // If the specified browser type exists:
   if (browserType) {
     // Close any existing browser.
-    await closeBrowser();
+    await closeBrowsers();
     // Launch a browser of the specified type.
     const browserOptions = {};
     if (debug) {
@@ -258,6 +274,11 @@ const launch = async typeName => {
       browserOptions.slowMo = waits;
     }
     const browser = await browserType.launch(browserOptions);
+    // Register it.
+    browsers.push({
+      browser,
+      typeName
+    });
     // Create a new context (window) in it, taller if debugging is on.
     const viewport = debug ? {
       viewPort: {
@@ -1261,8 +1282,8 @@ const doScript = async (report) => {
   report.testTimes = [];
   // Perform the specified acts.
   await doActs(report, 0, null);
-  // Close the browser.
-  await closeBrowser();
+  // Close all browsers.
+  await closeBrowsers();
   // Add the log statistics to the report.
   report.logCount = logCount;
   report.logSize = logSize;

package/tests/focInd.js

@@ -128,7 +128,7 @@ exports.reporter = async (page, revealAll, allowedDelay, withItems) => {
         if (! hasOutline) {
           // Returns whether a style property differs between focused and not focused.
           const diff = prop => styleDec[prop] !== styleBlurred[prop];
-          // Determine whether the element has another allowed focus indicator.
+          // Determine whether the element has another recognized focus indicator.
           const hasDiffOutline = styleDec.outlineWidth !== '0px'
           && styleDec.outlineColor !== 'rgba(0, 0, 0, 0)'
           && (diff('outlineStyle') || diff('outlineWidth'));
@@ -138,6 +138,7 @@ exports.reporter = async (page, revealAll, allowedDelay, withItems) => {
           const hasIndicator
           = hasDiffOutline
           || hasDiffBorder
+          || diff('box-shadow')
           || diff('fontSize')
           || diff('fontStyle')
           || diff('textDecorationLine')

package/tests/hover.js

@@ -28,6 +28,7 @@ const targetSelectors = ['a', 'button', 'input', '[role=menuitem]', 'span']
 .join(', ');
 // Initialize the result.
 const data = {
+  populationSize: 0,
   totals: {
     triggers: 0,
     madeVisible: 0,
@@ -83,13 +84,9 @@ const find = async (withItems, page, triggers) => {
       if (['A', 'BUTTON'].includes(tagName)) {
         const rootJSHandle = await page.evaluateHandle(
           firstTrigger => {
-            const parent = firstTrigger.parentElement;
-            if (parent) {
-              return parent.parentElement || parent;
-            }
-            else {
-              return firstTrigger;
-            }
+            const parent = firstTrigger.parentElement || firstTrigger;
+            const grandparent = parent.parentElement || parent;
+            return grandparent;
           },
           firstTrigger
         );
@@ -226,6 +223,7 @@ exports.reporter = async (page, sampleSize = Infinity, withItems) => {
   });
   // If they number more than the sample size limit, sample them.
   const triggerCount = triggers.length;
+  data.populationSize = triggerCount;
   const triggerSample = triggerCount > sampleSize ? getSample(triggers, sampleSize) : triggers;
   // Find and document the hover-triggered disclosures.
   await find(withItems, page, triggerSample);

package/tests/ibm.js

@@ -19,12 +19,13 @@
 */
 // Import required modules.
 const fs = require('fs').promises;
-const {getCompliance} = require('accessibility-checker');
+const {getCompliance, close} = require('accessibility-checker');
 // Runs the IBM test.
 const run = async content => {
   const nowLabel = (new Date()).toISOString().slice(0, 19);
   // Return the result of a test.
   const ibmReport = await getCompliance(content, nowLabel);
+  await close();
   return ibmReport;
 };
 // Trims an IBM report.
@@ -67,11 +68,11 @@ const doTest = async (content, withItems, timeLimit) => {
       resolve({});
     }, 1000 * timeLimit);
   });
-  // Conduct and report the test.
+  // Conduct the test and get a Promise of the report.
   const ibmReport = run(content);
-  // Wait for the report until the time limit expires.
+  // Wait for completion or until the time limit expires.
   const ibmReportIfFast = await Promise.race([ibmReport, wait]);
-  // Delete the report files.
+  // Delete existing report files.
   try {
     const reportNames = await fs.readdir('results');
     for (const reportName of reportNames) {
@@ -88,7 +89,6 @@ const doTest = async (content, withItems, timeLimit) => {
     return ibmTypeReport;
   }
   else {
-    console.log('ERROR: getting ibm test report took too long');
     return {
       prevented: true,
       error: 'ERROR: getting ibm test report took too long'
@@ -105,6 +105,7 @@ exports.reporter = async (page, withItems, withNewContent) => {
     result.content = await doTest(typeContent, withItems, timeLimit);
     if (result.content.prevented) {
       result.prevented = true;
+      console.log('ERROR: Getting ibm test report from page took too long');
     }
   }
   // If a test with new content is to be performed:
@@ -112,8 +113,9 @@ exports.reporter = async (page, withItems, withNewContent) => {
     const timeLimit = 20;
     const typeContent = page.url();
     result.url = await doTest(typeContent, withItems, timeLimit);
-    if (result.content.prevented) {
+    if (result.url.prevented) {
       result.prevented = true;
+      console.log('ERROR: Getting ibm test report from URL took too long');
     }
   }
   return {result};