testaro 5.12.1 → 5.12.2

package/package.json

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

package/run.js

@@ -687,7 +687,7 @@ const doActs = async (report, actIndex, page) => {
             }
             catch(error) {
               actIndex = -2;
-              waitError(page, act, error, 'URL');
+              waitError(page, act, error, 'text in the URL');
             }
           }
           // Otherwise, if the text is to be a substring of the page title:
@@ -709,7 +709,7 @@ const doActs = async (report, actIndex, page) => {
             }
             catch(error) {
               actIndex = -2;
-              waitError(page, act, error, 'title');
+              waitError(page, act, error, 'text in the title');
             }
           }
           // Otherwise, if the text is to be a substring of the text of the page body:
@@ -723,14 +723,14 @@ const doActs = async (report, actIndex, page) => {
                 which,
                 {
                   polling: 2000,
-                  timeout: 10000
+                  timeout: 15000
                 }
               );
               result.found = true;
             }
             catch(error) {
               actIndex = -2;
-              waitError(page, act, error, 'body');
+              waitError(page, act, error, 'text in the body');
             }
           }
         }
@@ -950,80 +950,71 @@ const doActs = async (report, actIndex, page) => {
               act.result = {found: false};
               let selection = {};
               let tries = 0;
-              const slimText = debloat(act.which);
+              const slimText = act.which ? debloat(act.which) : '';
               while (tries++ < 5 && ! act.result.found) {
-                if (act.which) {
-                  // If the page still exists:
-                  if (page) {
-                    // Identify the elements of the specified type.
-                    const selections = await page.$$(selector);
-                    // If there are any:
-                    if (selections.length) {
-                      // If there are enough to make a match possible:
-                      if ((act.index || 0) < selections.length) {
-                        // For each element of the specified type:
-                        let matchCount = 0;
-                        const selectionTexts = [];
-                        for (selection of selections) {
-                          // Add its text or an empty string to the list of texts of such elements.
-                          const selectionText = slimText ? await textOf(page, selection) : '';
-                          selectionTexts.push(selectionText);
-                          // If its text includes any specified text:
-                          if (selectionText.includes(slimText)) {
-                            // If the element has the specified index among such elements:
-                            if (matchCount++ === (act.index || 0)) {
-                              // Report it as the matching element and stop checking.
-                              act.result.found = true;
-                              act.result.text = slimText;
-                              break;
-                            }
+                // If the page still exists:
+                if (page) {
+                  // Identify the elements of the specified type.
+                  const selections = await page.$$(selector);
+                  // If there are any:
+                  if (selections.length) {
+                    // If there are enough to make a match possible:
+                    if ((act.index || 0) < selections.length) {
+                      // For each element of the specified type:
+                      let matchCount = 0;
+                      const selectionTexts = [];
+                      for (selection of selections) {
+                        // Add its text or an empty string to the list of texts of such elements.
+                        const selectionText = slimText ? await textOf(page, selection) : '';
+                        selectionTexts.push(selectionText);
+                        // If its text includes any specified text:
+                        if (selectionText.includes(slimText)) {
+                          // If the element has the specified index among such elements:
+                          if (matchCount++ === (act.index || 0)) {
+                            // Report it as the matching element and stop checking.
+                            act.result.found = true;
+                            act.result.text = slimText;
+                            break;
                           }
                         }
-                        // If no element satisfied the specifications:
-                        if (! act.result.found) {
-                          // Add the failure data to the report.
-                          act.result.success = false;
-                          act.result.error = 'exhausted';
-                          act.result.typeElementCount = selections.length;
-                          if (slimText) {
-                            act.result.textElementCount = --matchCount;
-                          }
-                          act.result.message = 'Not enough specified elements exist';
-                          act.result.candidateTexts = selectionTexts;
-                        }
                       }
-                      // Otherwise, i.e. if there are too few such elements to make a match possible:
-                      else {
+                      // If no element satisfied the specifications:
+                      if (! act.result.found) {
                         // Add the failure data to the report.
                         act.result.success = false;
-                        act.result.error = 'fewer';
+                        act.result.error = 'exhausted';
                         act.result.typeElementCount = selections.length;
-                        act.result.message = 'Elements of specified type too few';
+                        if (slimText) {
+                          act.result.textElementCount = --matchCount;
+                        }
+                        act.result.message = 'Not enough specified elements exist';
+                        act.result.candidateTexts = selectionTexts;
                       }
                     }
-                    // Otherwise, i.e. if there are no elements of the specified type:
+                    // Otherwise, i.e. if there are too few such elements to make a match possible:
                     else {
                       // Add the failure data to the report.
                       act.result.success = false;
-                      act.result.error = 'none';
-                      act.result.typeElementCount = 0;
-                      act.result.message = 'No elements of specified type found';
+                      act.result.error = 'fewer';
+                      act.result.typeElementCount = selections.length;
+                      act.result.message = 'Elements of specified type too few';
                     }
                   }
-                  // Otherwise, i.e. if the page no longer exists:
+                  // Otherwise, i.e. if there are no elements of the specified type:
                   else {
                     // Add the failure data to the report.
                     act.result.success = false;
-                    act.result.error = 'gone';
-                    act.result.message = 'Page gone';
+                    act.result.error = 'none';
+                    act.result.typeElementCount = 0;
+                    act.result.message = 'No elements of specified type found';
                   }
                 }
-                // Otherwise, i.e. if no text was specified:
+                // Otherwise, i.e. if the page no longer exists:
                 else {
                   // Add the failure data to the report.
                   act.result.success = false;
-                  act.result.error = 'text';
-                  act.result.message = 'No text specified';
+                  act.result.error = 'gone';
+                  act.result.message = 'Page gone';
                 }
                 if (! act.result.found) {
                   await wait(2000);
@@ -1036,11 +1027,11 @@ const doActs = async (report, actIndex, page) => {
                 const doAndWait = async actionIsClick => {
                   try {
                     const [newPage] = await Promise.all([
-                      page.context().waitForEvent('page', {timeout: 7000}),
+                      page.context().waitForEvent('page', {timeout: 15000}),
                       actionIsClick ? selection.click({timeout: 4000}) : selection.press('Enter')
                     ]);
                     // Wait for the new page to load.
-                    await newPage.waitForLoadState('domcontentloaded', {timeout: 10000});
+                    await newPage.waitForLoadState('domcontentloaded', {timeout: 15000});
                     // Make the new page the current page.
                     page = newPage;
                     act.result.success = true;

package/tests/textNodes.js

@@ -15,6 +15,15 @@ exports.reporter = async (page, detailLevel, text) => {
       const matchNodes = [];
       // Normalize the body.
       document.body.normalize();
+      // Make a copy of the body.
+      const tempBody = document.body.cloneNode(true);
+      // Insert it into the document.
+      document.body.appendChild(tempBody);
+      // Remove the irrelevant text content from the copy.
+      const extraElements = Array.from(tempBody.querySelectorAll('style, script, svg'));
+      extraElements.forEach(element => {
+        element.textContent = '';
+      });
       // FUNCTION DEFINITIONS START
       // Compacts a string.
       const compact = string => string.replace(/\s+/g, ' ').trim();
@@ -26,9 +35,9 @@ exports.reporter = async (page, detailLevel, text) => {
         const data = {
           tagName: element.tagName
         };
-        if (! ['SCRIPT', 'SVG', 'svg'].includes(element.tagName)) {
+        if (! ['STYLE', 'SCRIPT', 'SVG', 'svg'].includes(element.tagName)) {
           if (withText) {
-            data.text = element.textContent;
+            data.text = compact(element.textContent);
           }
           // Add data on its attributes, if any, to the data.
           const {attributes} = element;
@@ -73,16 +82,13 @@ exports.reporter = async (page, detailLevel, text) => {
       // FUNCTION DEFINITIONS END
       const normText = normalize(text);
       // Create a collection of the text nodes.
-      const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT);
+      const walker = document.createTreeWalker(tempBody, NodeFilter.SHOW_TEXT);
       // Get their count.
       const data = {nodeCount: 0};
       let more = true;
       while(more) {
         if (walker.nextNode()) {
-          if (
-            normalize(walker.currentNode.nodeValue).includes(normText)
-            && walker.currentNode.parentElement.tagName !== 'SCRIPT'
-          ) {
+          if (normalize(walker.currentNode.nodeValue).includes(normText)) {
             data.nodeCount++;
             matchNodes.push(walker.currentNode);
           }
@@ -120,6 +126,7 @@ exports.reporter = async (page, detailLevel, text) => {
           data.items.push(itemData);
         });
       }
+      document.body.removeChild(tempBody);
       return data;
     }, [detailLevel, text]);
   }