testaro 5.1.1 → 5.1.2

package/package.json

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

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};
 };