testaro 45.0.5 → 45.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "45.0.5",
+  "version": "45.0.7",
   "description": "Run 1000 web accessibility tests from 10 tools and get a standardized report",
   "main": "index.js",
   "scripts": {

package/procs/identify.js

@@ -170,35 +170,45 @@ exports.identify = async (instance, page) => {
     }
     // If either ID remains undefined and the instance specifies a tag name:
     if (tagName && ! (elementID.boxID && elementID.pathID)) {
-      // Get locators for elements with the tag name.
-      let locators = page.locator(tagName);
-      // If there is exactly 1 of them:
-      let locatorCount = await locators.count();
-      if (locatorCount === 1) {
-        // Add a box ID and a path ID to the result.
-        await addIDs(locators, elementID);
-      }
-      // If either ID remains undefined and the instance also specifies an excerpt:
-      if (excerpt && ! (elementID.boxID && elementID.pathID)) {
-        // Get the plain text parts of the excerpt, converting ... to an empty string.
-        const minTagExcerpt = excerpt.replace(/<[^>]+>/g, '<>');
-        const plainParts = (minTagExcerpt.match(/[^<>]+/g) || [])
-        .map(part => part === '...' ? '' : part);
-        // Get the longest of them.
-        const sortedPlainParts = plainParts.sort((a, b) => b.length - a.length);
-        const mainPart = sortedPlainParts.length ? sortedPlainParts[0] : '';
-        // If there is one:
-        if (mainPart.trim().replace(/\s+/g, '').length) {
-          // Get locators for elements with the tag name and the text.
-          const locators = page.locator(tagName.toLowerCase(), {hasText: mainPart});
-          // If there is exactly 1 of them:
-          const locatorCount = await locators.count();
-          if (locatorCount === 1) {
-            // Add a box ID and a path ID to the result.
-            await addIDs(locators, elementID);
+      try {
+        // Get locators for elements with the tag name.
+        let locators = page.locator(tagName);
+        // If there is exactly 1 of them:
+        let locatorCount = await locators.count();
+        if (locatorCount === 1) {
+          // Add a box ID and a path ID to the result.
+          await addIDs(locators, elementID);
+        }
+        // If either ID remains undefined and the instance also specifies an excerpt:
+        if (excerpt && ! (elementID.boxID && elementID.pathID)) {
+          // Get the plain text parts of the excerpt, converting ... to an empty string.
+          const minTagExcerpt = excerpt.replace(/<[^>]+>/g, '<>');
+          const plainParts = (minTagExcerpt.match(/[^<>]+/g) || [])
+          .map(part => part === '...' ? '' : part);
+          // Get the longest of them.
+          const sortedPlainParts = plainParts.sort((a, b) => b.length - a.length);
+          const mainPart = sortedPlainParts.length ? sortedPlainParts[0] : '';
+          // If there is one:
+          if (mainPart.trim().replace(/\s+/g, '').length) {
+            // Get locators for elements with the tag name and the text.
+            const locators = page.locator(tagName.toLowerCase(), {hasText: mainPart});
+            // If there is exactly 1 of them:
+            const locatorCount = await locators.count();
+            if (locatorCount === 1) {
+              // Add a box ID and a path ID to the result.
+              await addIDs(locators, elementID);
+            }
           }
         }
       }
+      // If the tag name is invalid:
+      catch(error) {
+        // Add this to the instance.
+        instance.invalidity = {
+          badProperty: 'tagName',
+          validityError: error.message
+        };
+      }
     }
     // Return the result (not yet getting IDs from Nu Html Checker lines and columns).
     return elementID;

package/tests/aslint.js

@@ -85,17 +85,6 @@ exports.reporter = async (page, report, actIndex, timeLimit) => {
         timeout: 1000 * timeLimit
       };
       await reportLoc.waitFor(waitOptions);
-      // const timeResult = await doBy(timeLimit, reportLoc, 'waitFor', [waitArg], 'aslint testing');
-      // console.log(`timeResult type is ${typeof timeResult}`);
-      // If the result attachment timed out:
-      /*
-      if (timeResult === 'timedOut') {
-        // Report this.
-        data.prevented = true;
-        data.error = 'Attachment of results to page by aslint timed out';
-        await page.close({runBeforeUnload: true});
-      }
-      */
     }
     catch(error) {
       const message = 'Attachment of test results to page failed';

package/tests/wave.js

@@ -58,57 +58,66 @@ exports.reporter = async (page, report, actIndex) => {
           // When they arrive:
           response.on('end', async () => {
             // Delete unnecessary properties.
-            const actResult = JSON.parse(rawReport);
-            const {categories, statistics} = actResult;
-            delete categories.feature;
-            delete categories.structure;
-            delete categories.aria;
-            // If rules were specified:
-            if (rules && rules.length) {
-              // For each WAVE rule category:
-              ['error', 'contrast', 'alert'].forEach(category => {
-                // If any violations were reported:
-                if (
-                  categories[category]
-                  && categories[category].items
-                  && Object.keys(categories[category].items).length
-                ) {
-                  // For each rule violated:
-                  Object.keys(categories[category].items).forEach(ruleID => {
-                    // If it was not a specified rule:
-                    if (! rules.includes(ruleID)) {
-                      // Decrease the category violation count by the count of its violations.
-                      categories[category].count -= categories[category].items[ruleID].count;
-                      // Remove its violations from the report.
-                      delete categories[category].items[ruleID];
-                    }
-                  });
-                }
+            try {
+              const actResult = JSON.parse(rawReport);
+              const {categories, statistics} = actResult;
+              delete categories.feature;
+              delete categories.structure;
+              delete categories.aria;
+              // If rules were specified:
+              if (rules && rules.length) {
+                // For each WAVE rule category:
+                ['error', 'contrast', 'alert'].forEach(category => {
+                  // If any violations were reported:
+                  if (
+                    categories[category]
+                    && categories[category].items
+                    && Object.keys(categories[category].items).length
+                  ) {
+                    // For each rule violated:
+                    Object.keys(categories[category].items).forEach(ruleID => {
+                      // If it was not a specified rule:
+                      if (! rules.includes(ruleID)) {
+                        // Decrease the category violation count by the count of its violations.
+                        categories[category].count -= categories[category].items[ruleID].count;
+                        // Remove its violations from the report.
+                        delete categories[category].items[ruleID];
+                      }
+                    });
+                  }
+                });
+              }
+              // Add WCAG information from the WAVE documentation.
+              const waveDocJSON = await fs.readFile('procs/wavedoc.json');
+              const waveDoc = JSON.parse(waveDocJSON);
+              Object.keys(categories).forEach(categoryName => {
+                const category = categories[categoryName];
+                const {items} = category;
+                Object.keys(items).forEach(issueName => {
+                  const issueDoc = waveDoc.find((issue => issue.name === issueName));
+                  const {guidelines} = issueDoc;
+                  items[issueName].wcag = guidelines;
+                });
               });
+              // Add important data to the result.
+              if (statistics) {
+                data.pageTitle = statistics.pagetitle || '';
+                data.pageURL = statistics.pageurl || '';
+                data.time = statistics.time || null;
+                data.creditsRemaining = statistics.creditsremaining || null;
+                data.allItemCount = statistics.allitemcount || null;
+                data.totalElements = statistics.totalelements || null;
+              }
+              // Return the result.
+              resolve(actResult);
             }
-            // Add WCAG information from the WAVE documentation.
-            const waveDocJSON = await fs.readFile('procs/wavedoc.json');
-            const waveDoc = JSON.parse(waveDocJSON);
-            Object.keys(categories).forEach(categoryName => {
-              const category = categories[categoryName];
-              const {items} = category;
-              Object.keys(items).forEach(issueName => {
-                const issueDoc = waveDoc.find((issue => issue.name === issueName));
-                const {guidelines} = issueDoc;
-                items[issueName].wcag = guidelines;
-              });
-            });
-            // Add important data to the result.
-            if (statistics) {
-              data.pageTitle = statistics.pagetitle || '';
-              data.pageURL = statistics.pageurl || '';
-              data.time = statistics.time || null;
-              data.creditsRemaining = statistics.creditsremaining || null;
-              data.allItemCount = statistics.allitemcount || null;
-              data.totalElements = statistics.totalelements || null;
-            }
-            // Return the result.
-            resolve(actResult);
+            catch(error) {
+              console.log(`ERROR parsing tool report: ${error.message}`);
+              console.log(`rawReport: ${rawReport}`);
+              data.prevented = true;
+              data.error = error.message;
+              resolve(result);
+            };
           });
         }
       );