testaro 69.0.2 → 69.1.0

package/package.json

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

package/procs/catalog.js

@@ -110,8 +110,11 @@ exports.getCatalog = async report => {
           ) {
             // For each element that has it:
             textElementIndexes.forEach(index => {
-              // If it is not in the head:
-              if (! cat.element[index].pathID.includes('/head[1]')) {
+              // If it is not in the head, a script, a style, or a noscript element:
+              if (
+                ! ['/head[1]', '/script[', '/style[', '/noscript[']
+                .some(excluder => cat.element[index].pathID.includes(excluder))
+              ) {
                 // Mark it as linkable in the element data in the catalog.
                 cat.element[index].textLinkable = true;
               }

package/procs/getSource.js

@@ -23,23 +23,28 @@ const fs = require('fs/promises');
 exports.getSource = async page => {
   const url = page.url();
   const scheme = url.replace(/:.+/, '');
+  // Initialize the test data.
   const data = {
     prevented: false,
     source: ''
   };
+  // If the page is a local file:
   if (scheme === 'file') {
     const filePath = url.slice(7);
+    // Get the source from it.
     const rawPage = await fs.readFile(filePath, 'utf8');
+    // Add the source to the test data.
     data.source = rawPage;
   }
+  // Otherwise, i.e. if the page is not a local file:
   else {
     try {
-      const rawPageResponse = await fetch(url);
-      const rawPage = await rawPageResponse.text();
+      const response = await page.goto(url);
+      const rawPage = await response.text();
       data.source = rawPage;
     }
     catch(error) {
-      console.log(`ERROR getting source of ${url} (${error.message})`);
+      console.log(`ERROR (${error.message}) getting source of ${url}; cause: ${error.cause}`);
       data.prevented = true;
       data.error = `ERROR getting source of ${url}`;
     }

package/testaro/headingAmb.js

@@ -47,6 +47,11 @@ exports.reporter = async (page, catalog, withItems) => {
             // Return a violation description.
             return 'Heading has the same text as the prior same-level sibling heading';
           }
+          // Otherwise, i.e. if they do not have identical text contents:
+          else {
+            // Stop inspecting.
+            break;
+          }
         }
         // Otherwise, i.e. if it is superior to the element:
         else {

package/tests/testaro.js

@@ -118,14 +118,6 @@ const allRules = [
     timeOut: 5,
     defaultOn: true
   },
-  {
-    id: 'dupAtt',
-    what: 'duplicate attribute values',
-    contaminates: false,
-    needsAccessibleName: false,
-    timeOut: 5,
-    defaultOn: true
-  },
   {
     id: 'embAc',
     what: 'active elements embedded in links or buttons',
@@ -350,6 +342,14 @@ const allRules = [
     timeOut: 5,
     defaultOn: true
   },
+  {
+    id: 'dupAtt',
+    what: 'duplicate attribute values',
+    contaminates: false,
+    needsAccessibleName: false,
+    timeOut: 5,
+    defaultOn: true
+  },
   {
     id: 'autocomplete',
     what: 'name and email inputs without autocomplete attributes',
@@ -508,6 +508,7 @@ exports.reporter = async (page, report, actIndex) => {
     ? ruleSpec.slice(1)
     : allRules.filter(rule => rule.defaultOn && ! allRuleIDs.includes(rule.id));
     const jobRules = allRules.filter(rule => jobRuleIDs.includes(rule.id));
+    let justPrevented = false;
     // For each rule to be tested for:
     for (let ruleIndex = 0; ruleIndex < jobRules.length; ruleIndex++) {
       const rule = jobRules[ruleIndex];
@@ -526,6 +527,7 @@ exports.reporter = async (page, report, actIndex) => {
       const headEmulation = ruleResult.id.startsWith('shoot') ? 'high' : 'high';
       // Get whether the rule needs a new browser launched.
       const needsLaunch = ruleIndex === 0
+      || justPrevented
       || jobRules[ruleIndex - 1].contaminates
       || jobRules[ruleIndex].needsAccessibleName && ! jobRules[ruleIndex - 1].needsAccessibleName;
       const pageClosed = page && page.isClosed();
@@ -542,6 +544,7 @@ exports.reporter = async (page, report, actIndex) => {
           actIndex,
           tempBrowserID: browserID,
           tempURL: url,
+          headEmulation,
           xPathNeed: 'script',
           needsAccessibleName: jobRules[ruleIndex].needsAccessibleName,
           retries: 2
@@ -580,6 +583,7 @@ exports.reporter = async (page, report, actIndex) => {
         timer = new Promise(resolve => {
           timeout = setTimeout(() => {
             // Add data about the timeout to the rule result.
+            justPrevented = true;
             ruleResult.prevented = true;
             ruleResult.error = 'Timeout';
             console.log(`ERROR: Test of testaro rule ${ruleResult.id} timed out`);
@@ -609,6 +613,7 @@ exports.reporter = async (page, report, actIndex) => {
           if (ruleResult.instances) {
             standardResult.instances.push(... ruleResult.instances);
           }
+          justPrevented = false;
           // If testing is to stop after a failure and the page failed the test:
           if (stopOnFail && ruleReport.totals?.some(total => total)) {
             // Test for no more rules.
@@ -618,6 +623,8 @@ exports.reporter = async (page, report, actIndex) => {
       }
       // If an error is thrown by the test:
       catch(error) {
+        ruleResult.prevented = true;
+        justPrevented = true;
         const isPageClosed = ['closed', 'Protocol error', 'Target page'].some(phrase =>
           error.message.includes(phrase)
         );
@@ -629,7 +636,6 @@ exports.reporter = async (page, report, actIndex) => {
         // Otherwise, i.e. if the page is open:
         else {
           // Add this to the rule result.
-          ruleResult.prevented = true;
           ruleResult.error = error.message;
           console.log(
             `ERROR: Test of testaro rule ${ruleResult.id} prevented (${error.message})`