testaro 5.1.1 → 5.2.0

package/htmlcs/HTMLCS.js

@@ -6321,10 +6321,8 @@
           self.output(messages[i]);
           msgCount[messages[i].type]++;
         }
-        console.log("done");
       }, function () {
         console.log("Something in HTML_CodeSniffer failed to parse. Cannot run.");
-        console.log("done");
       }, "en");
       return Array.from(messageStrings);
     };
@@ -7968,4 +7966,4 @@
     };
   }();    // Expose globals.
   return _global;
-}));
+}));

package/package.json

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

package/run.js

@@ -36,7 +36,7 @@ const tests = {
   focAll: 'focusable and Tab-focused elements',
   focInd: 'focus indicators',
   focOp: 'focusability and operability',
-  hover: 'hover-caused content additions',
+  hover: 'hover-caused content changes',
   htmlcs: 'HTML CodeSniffer WCAG 2.1 AA ruleset',
   ibm: 'IBM Accessibility Checker',
   labClash: 'labeling inconsistencies',
@@ -257,6 +257,7 @@ const closeBrowsers = async () => {
       await browser.close();
     }
   }
+  browsers = [];
 };
 // Launches a browser.
 const launch = async typeName => {
@@ -1305,11 +1306,12 @@ const doScript = async (report) => {
     value: ((new Date()).toISOString().slice(0, 19))
   });
 };
-// Injects url acts into a report where necessary to undo DOM changes.
-const injectURLActs = acts => {
+// Injects launch and url acts into a report where necessary to undo DOM changes.
+const injectLaunches = acts => {
   let injectMore = true;
   while (injectMore) {
-    const injectIndex = acts.findIndex((act, index) =>
+    const injectIndex = acts.findIndex(
+      (act, index) =>
       index < acts.length - 1
       && act.type === 'test'
       && acts[index + 1].type === 'test'
@@ -1319,6 +1321,14 @@ const injectURLActs = acts => {
       injectMore = false;
     }
     else {
+      const lastBrowserType = acts.reduce((browserType, act, index) => {
+        if (act.type === 'launch' && index < injectIndex) {
+          return act.which;
+        }
+        else {
+          return browserType;
+        }
+      }, '');
       const lastURL = acts.reduce((url, act, index) => {
         if (act.type === 'url' && index < injectIndex) {
           return act.which;
@@ -1327,11 +1337,20 @@ const injectURLActs = acts => {
           return url;
         }
       }, '');
-      acts.splice(injectIndex + 1, 0, {
-        type: 'url',
-        which: lastURL,
-        what: 'URL'
-      });
+      acts.splice(
+        injectIndex + 1,
+        0,
+        {
+          type: 'launch',
+          which: lastBrowserType,
+          what: `${lastBrowserType} browser`
+        },
+        {
+          type: 'url',
+          which: lastURL,
+          what: 'URL'
+        }
+      );
     }
   }
 };
@@ -1354,9 +1373,12 @@ exports.handleRequest = async report => {
     report.timeStamp = report.id.replace(/-.+/, '');
     // Add the script commands to the report as its initial acts.
     report.acts = JSON.parse(JSON.stringify(report.script.commands));
-    // Inject url acts where necessary to undo DOM changes, if specified.
+    /*
+      Inject launch and url acts where necessary to undo DOM changes, if specified.
+      Injection of url acts alone does not guarantee test independence.
+    */
     if (urlInject === 'yes') {
-      injectURLActs(report.acts);
+      injectLaunches(report.acts);
     }
     // Perform the acts, asynchronously adding to the log and report.
     await doScript(report);

package/tests/hover.js

@@ -198,7 +198,7 @@ const find = async (withItems, page, region, sample, popRatio) => {
         }
       }
       catch (error) {
-        console.log(`ERROR hovering (${error.message})`);
+        console.log(`ERROR hovering (${error.message.replace(/\n.+/s, '')})`);
         data.totals.unhoverables++;
         if (withItems) {
           const id = await firstTrigger.getAttribute('id');

package/tests/htmlcs.js

@@ -18,45 +18,63 @@ exports.reporter = async page => {
   if (! result.prevented) {
     let messageStrings = [];
     for (const standard of ['WCAG2AA']) {
-      const nextIssues = await page.evaluate(standard => HTMLCS_RUNNER.run(standard), standard);
-      messageStrings.push(... nextIssues);
-    }
-    // Sort the issues by class and standard.
-    messageStrings.sort();
-    // Remove any duplicate issues.
-    messageStrings = [... new Set(messageStrings)];
-    // Initialize the result.
-    result.Error = {};
-    result.Warning = {};
-    // For each issue:
-    messageStrings.forEach(string => {
-      const parts = string.split(/\|/, 6);
-      const partCount = parts.length;
-      if (partCount < 6) {
-        console.log(`ERROR: Issue string ${string} has too few parts`);
+      const nextIssues = await page.evaluate(standard => {
+        let issues = null;
+        try {
+          issues = HTMLCS_RUNNER.run(standard);
+        }
+        catch(error) {
+          console.log(`ERROR executing HTMLCS_RUNNER on ${document.URL} (${error.message})`);
+        };
+        return issues;
+      }, standard);
+      if (nextIssues) {
+        messageStrings.push(... nextIssues);
+      }
+      else {
+        result.prevented = true;
+        result.error = 'ERROR executing HTMLCS_RUNNER in the page';
+        break;
       }
-      // If it is an error or a warning (not a notice):
-      else if (['Error', 'Warning'].includes(parts[0])) {
-        /*
-          Add the issue to an issueClass.issueCode.description array in the result.
-          This saves space, because, although some descriptions are issue-specific, such as
-          descriptions that state the contrast ratio of an element, most descriptions are
-          generic, so typically many issues share a description.
-        */
-        const issueCode = parts[1].replace(/^WCAG2|\.Principle\d\.Guideline[\d_]+/g, '');
-        if (! result[parts[0]][issueCode]) {
-          result[parts[0]][issueCode] = {};
+    };
+    if (! result.prevented) {
+      // Sort the issues by class and standard.
+      messageStrings.sort();
+      // Remove any duplicate issues.
+      messageStrings = [... new Set(messageStrings)];
+      // Initialize the result.
+      result.Error = {};
+      result.Warning = {};
+      // For each issue:
+      messageStrings.forEach(string => {
+        const parts = string.split(/\|/, 6);
+        const partCount = parts.length;
+        if (partCount < 6) {
+          console.log(`ERROR: Issue string ${string} has too few parts`);
         }
-        if (! result[parts[0]][issueCode][parts[4]]) {
-          result[parts[0]][issueCode][parts[4]] = [];
+        // If it is an error or a warning (not a notice):
+        else if (['Error', 'Warning'].includes(parts[0])) {
+          /*
+            Add the issue to an issueClass.issueCode.description array in the result.
+            This saves space, because, although some descriptions are issue-specific, such as
+            descriptions that state the contrast ratio of an element, most descriptions are
+            generic, so typically many issues share a description.
+          */
+          const issueCode = parts[1].replace(/^WCAG2|\.Principle\d\.Guideline[\d_]+/g, '');
+          if (! result[parts[0]][issueCode]) {
+            result[parts[0]][issueCode] = {};
+          }
+          if (! result[parts[0]][issueCode][parts[4]]) {
+            result[parts[0]][issueCode][parts[4]] = [];
+          }
+          result[parts[0]][issueCode][parts[4]].push({
+            tagName: parts[2],
+            id: parts[3],
+            code: parts[5]
+          });
         }
-        result[parts[0]][issueCode][parts[4]].push({
-          tagName: parts[2],
-          id: parts[3],
-          code: parts[5]
-        });
-      }
-    });
+      });
+    }
   }
   return {result};
 };