testaro 5.7.4 → 5.7.5

package/package.json

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

package/run.js

@@ -106,6 +106,7 @@ let visitRejectionCount = 0;
 let visitLatency = 0;
 let actCount = 0;
 // Facts about the current browser.
+let browser;
 let browserContext;
 let browserTypeName;
 let requestedURL = '';
@@ -257,12 +258,24 @@ const isValidReport = async report => {
 
 // ########## OTHER FUNCTIONS
 
+// Closes the current browser.
+const browserClose = async () => {
+  if (browser) {
+    const contexts = browser.contexts();
+    for (const context of contexts) {
+      await context.close();
+    }
+    await browser.close();
+  }
+};
 // Launches a browser.
 const launch = async typeName => {
   const browserType = require('playwright')[typeName];
   // If the specified browser type exists:
   if (browserType) {
-    // Launch a browser of the specified type.
+    // Close the current browser, if any.
+    await browserClose();
+    // Launch a browser of that type.
     const browserOptions = {};
     if (debug) {
       browserOptions.headless = false;
@@ -271,7 +284,7 @@ const launch = async typeName => {
       browserOptions.slowMo = waits;
     }
     let healthy = true;
-    const browser = await browserType.launch(browserOptions)
+    browser = await browserType.launch(browserOptions)
     .catch(error => {
       healthy = false;
       console.log(`ERROR launching browser: ${error.message.replace(/\n.+/s, '')}`);

package/tests/nuVal.js

@@ -11,7 +11,7 @@ const https = require('https');
 exports.reporter = async page => {
   const pageContent = await page.content();
   // Get the data from a Nu validation.
-  const data = await new Promise((resolve, reject) => {
+  const dataPromise = new Promise(resolve => {
     try {
       const request = https.request(
         {
@@ -40,7 +40,7 @@ exports.reporter = async page => {
               return resolve(result);
             }
             catch (error) {
-              console.log(`Validation failed (${error.message})`);
+              console.log(`ERROR: Validation failed (${error.message})`);
               return resolve({
                 prevented: true,
                 error: error.message,
@@ -54,7 +54,7 @@ exports.reporter = async page => {
       request.end();
       request.on('error', error => {
         console.log(error.message);
-        return reject({
+        return resolve({
           prevented: true,
           error: error.message
         });
@@ -62,11 +62,22 @@ exports.reporter = async page => {
     }
     catch(error) {
       console.log(error.message);
-      return reject({
+      return resolve({
         prevented: true,
         error: error.message
       });
     }
   });
+  const timeoutPromise = new Promise(resolve => {
+    const timeLimit = 12;
+    const timeoutID = setTimeout(() => {
+      resolve({
+        prevented: true,
+        error: `ERROR: Validation timed out at ${timeLimit} seconds`
+      });
+      clearTimeout(timeoutID);
+    }, 1000 * timeLimit);
+  });
+  const data = await Promise.race([dataPromise, timeoutPromise]);
   return {result: data};
 };