testaro 4.12.1 → 4.12.2

package/aceconfig.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "4.12.1",
+  "version": "4.12.2",
   "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).
@@ -77,7 +81,9 @@ const errorWords = [
   'missing',
   'deprecated'
 ];
+
 // ########## VARIABLES
+
 // Facts about the current session.
 let logCount = 0;
 let logSize = 0;
@@ -91,7 +97,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,13 +244,17 @@ const isValidReport = async report => {
     return false;
   }
 };
+
 // ########## OTHER FUNCTIONS
-// Closes any existing browser.
-const closeBrowser = async () => {
-  const browser = browserContext && browserContext.browser();
-  if (browser) {
-    console.log(`Closing browser, version ${browser.version()}`);
-    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.
@@ -249,7 +263,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) {
@@ -259,6 +273,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: {
@@ -1262,8 +1281,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/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) {