testaro 2.3.3 → 2.3.6

package/commands.js

@@ -142,6 +142,12 @@ exports.commands = {
     ]
   },
   tests: {
+    aatt: [
+      'Perform an AATT test with HTML CodeSniffer',
+      {
+        waitLong: [false, 'boolean', '', 'whether to wait 20 instead of 10 seconds for the result']
+      }
+    ],
     axe: [
       'Perform an Axe test',
       {

package/index.js

@@ -454,7 +454,7 @@ const goto = async (page, url, timeout, waitUntil, isStrict) => {
     return 'error';
   });
   if (typeof response !== 'string') {
-    const httpStatus = response.statusCode;
+    const httpStatus = response.status();
     if ([200, 304].includes(httpStatus) || url.startsWith('file:')) {
       const actualURL = page.url();
       if (isStrict && deSlash(actualURL) !== deSlash(url)) {
@@ -1105,16 +1105,16 @@ const doScript = async (options, report) => {
     const scoreTable = scoreTables[0];
     const {result} = scoreTable;
     if (result) {
-      const {logWeights, deficit} = result;
-      if (logWeights && deficit) {
-        deficit.log = Math.floor(
+      const {logWeights, scores} = result;
+      if (logWeights && scores) {
+        scores.log = Math.floor(
           logWeights.count * logCount
           + logWeights.size * logSize
           + logWeights.prohibited * prohibitedCount
           + logWeights.visitTimeout * visitTimeoutCount
           + logWeights.visitRejection * visitRejectionCount
         );
-        deficit.total += deficit.log;
+        scores.total += scores.log;
       }
     }
   }

package/package.json

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

package/procs/score/asp09.js

@@ -538,7 +538,7 @@ exports.scorer = acts => {
           }
         });
       };
-      estimate(['aatt', 'axe', 'ibm', 'wave'], 100);
+      estimate(['alfa', 'aatt', 'axe', 'ibm', 'wave'], 100);
     }
   }
   // Return the score facts, except for the log test.

package/tests/aatt.js

@@ -7,8 +7,9 @@
 const {evaluate} = require('aatt');
 
 // FUNCTIONS
-exports.reporter = async page => {
-  const timeLimit = 30;
+exports.reporter = async (page, waitLong) => {
+  // Set the limit in seconds on the wait for the result.
+  const timeLimit = waitLong ? 20 : 10;
   // Get the HTML of the document body.
   const source = await page.content();
   // Return the result of a test with the HTML CodeSniffer WCAG 2.1 AA ruleset as a string.

package/tests/alfa.js

@@ -18,90 +18,92 @@ exports.reporter = async page => {
     const msgText = msg.text();
     console.log(msgText);
   });
-  const response = await rulePage.goto('https://alfa.siteimprove.com/rules', {timeout: 10000})
-  .catch(error => {
-    console.log(`ERROR: navigation to URL timed out (${error})`);
-    return {result: {error: 'ERROR: navigation to URL timed out'}};
-  });
-  let ruleData = {};
-  if (response.statusCode === 200) {
-    // Compile data on the rule IDs and summaries.
-    ruleData = await rulePage.evaluate(() => {
-      const rulePs = Array.from(document.querySelectorAll('p.h5'));
-      const ruleData = {};
-      rulePs.forEach(ruleP => {
-        const childNodes = Array.from(ruleP.childNodes);
-        const ruleID = childNodes[0].textContent.slice(4).toLowerCase();
-        const ruleText = childNodes
-        .slice(1)
-        .map(node => node.textContent)
-        .join(' ')
-        .trim()
-        .replace(/"/g, '\'')
-        .replace(/\s+/g, ' ');
-        ruleData[ruleID] = ruleText;
+  try {
+    const response = await rulePage.goto('https://alfa.siteimprove.com/rules', {timeout: 10000});
+    let ruleData = {};
+    if (response.status() === 200) {
+      // Compile data on the rule IDs and summaries.
+      ruleData = await rulePage.evaluate(() => {
+        const rulePs = Array.from(document.querySelectorAll('p.h5'));
+        const ruleData = {};
+        rulePs.forEach(ruleP => {
+          const childNodes = Array.from(ruleP.childNodes);
+          const ruleID = childNodes[0].textContent.slice(4).toLowerCase();
+          const ruleText = childNodes
+          .slice(1)
+          .map(node => node.textContent)
+          .join(' ')
+          .trim()
+          .replace(/"/g, '\'')
+          .replace(/\s+/g, ' ');
+          ruleData[ruleID] = ruleText;
+        });
+        return ruleData;
       });
-      return ruleData;
-    });
-    await rulePage.close();
-  }
-  const data = [];
-  await Scraper.with(async scraper => {
-    for (const input of await scraper.scrape(page.url())) {
-      const audit = Audit.of(input, alfaRules.default);
-      const outcomes = Array.from(await audit.evaluate());
-      outcomes.forEach((outcome, index) => {
-        const {target} = outcome;
-        if (target && ! target._members) {
-          const outcomeJ = outcome.toJSON();
-          const verdict = outcomeJ.outcome;
-          if (verdict !== 'passed') {
-            const {rule} = outcomeJ;
-            const {tags, uri, requirements} = rule;
-            const ruleID = uri.replace(/^.+-/, '');
-            const ruleSummary = ruleData[ruleID] || '';
-            const targetJ = outcomeJ.target;
-            const codeLines = target.toString().split('\n');
-            if (codeLines[0] === '#document') {
-              codeLines.splice(2, codeLines.length - 3, '...');
-            }
-            else if (codeLines[0].startsWith('<html')) {
-              codeLines.splice(1, codeLines.length - 2, '...');
-            }
-            const outcomeData = {
-              index,
-              verdict,
-              rule: {
-                ruleID,
-                ruleSummary,
-                scope: '',
-                uri,
-                requirements
-              },
-              target: {
-                type: targetJ.type,
-                tagName: targetJ.name || '',
-                path: target.path(),
-                codeLines: codeLines.map(line => line.length > 99 ? `${line.slice(0, 99)}...` : line)
+      await rulePage.close();
+    }
+    const data = [];
+    await Scraper.with(async scraper => {
+      for (const input of await scraper.scrape(page.url())) {
+        const audit = Audit.of(input, alfaRules.default);
+        const outcomes = Array.from(await audit.evaluate());
+        outcomes.forEach((outcome, index) => {
+          const {target} = outcome;
+          if (target && ! target._members) {
+            const outcomeJ = outcome.toJSON();
+            const verdict = outcomeJ.outcome;
+            if (verdict !== 'passed') {
+              const {rule} = outcomeJ;
+              const {tags, uri, requirements} = rule;
+              const ruleID = uri.replace(/^.+-/, '');
+              const ruleSummary = ruleData[ruleID] || '';
+              const targetJ = outcomeJ.target;
+              const codeLines = target.toString().split('\n');
+              if (codeLines[0] === '#document') {
+                codeLines.splice(2, codeLines.length - 3, '...');
               }
-            };
-            const etcTags = [];
-            tags.forEach(tag => {
-              if (tag.type === 'scope') {
-                outcomeData.rule.scope = tag.scope;
+              else if (codeLines[0].startsWith('<html')) {
+                codeLines.splice(1, codeLines.length - 2, '...');
               }
-              else {
-                etcTags.push(tag);
+              const outcomeData = {
+                index,
+                verdict,
+                rule: {
+                  ruleID,
+                  ruleSummary,
+                  scope: '',
+                  uri,
+                  requirements
+                },
+                target: {
+                  type: targetJ.type,
+                  tagName: targetJ.name || '',
+                  path: target.path(),
+                  codeLines: codeLines.map(line => line.length > 99 ? `${line.slice(0, 99)}...` : line)
+                }
+              };
+              const etcTags = [];
+              tags.forEach(tag => {
+                if (tag.type === 'scope') {
+                  outcomeData.rule.scope = tag.scope;
+                }
+                else {
+                  etcTags.push(tag);
+                }
+              });
+              if (etcTags.length) {
+                outcomeData.etcTags = etcTags;
               }
-            });
-            if (etcTags.length) {
-              outcomeData.etcTags = etcTags;
+              data.push(outcomeData);
             }
-            data.push(outcomeData);
           }
-        }
-      });
-    }
-  });
-  return {result: data};
+        });
+      }
+    });
+    return {result: data};
+  }
+  catch(error) {
+    console.log(`ERROR: navigation to URL timed out (${error})`);
+    return {result: {error: 'ERROR: navigation to URL timed out'}};
+  }
 };