testaro 12.2.5 → 12.2.7

package/package.json

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

package/tests/ibm.js

@@ -120,25 +120,46 @@ const doTest = async (content, withItems, timeLimit, rules) => {
 };
 // Returns results of one or two IBM tests.
 exports.reporter = async (page, withItems, withNewContent, rules) => {
+  let contentType = 'both';
+  if (withNewContent) {
+    contentType = 'new';
+  }
+  else if (withNewContent === false) {
+    contentType = 'existing';
+  }
+  console.log(`>>>>>> Content type: ${contentType}`);
   // If a test with existing content is to be performed:
   const result = {};
-  if (! withNewContent) {
-    const timeLimit = 20;
-    const typeContent = await page.content();
-    result.content = await doTest(typeContent, withItems, timeLimit, rules);
-    if (result.content.prevented) {
+  const timeLimit = 20;
+  if (['existing', 'both'].includes(contentType)) {
+    try {
+      console.log('>>>>>> With existing content');
+      const typeContent = await page.content();
+      result.content = await doTest(typeContent, withItems, timeLimit, rules);
+      if (result.content.prevented) {
+        result.prevented = true;
+        console.log(`ERROR: Getting ibm test report from page timed out at ${timeLimit} seconds`);
+      }
+    }
+    catch(error) {
       result.prevented = true;
-      console.log(`ERROR: Getting ibm test report from page timed out at ${timeLimit} seconds`);
+      console.log(`ERROR: ibm test on page crashed with error ${error.message.slice(0, 200)}`);
     }
   }
   // If a test with new content is to be performed:
-  if ([true, undefined].includes(withNewContent)) {
-    const timeLimit = 20;
-    const typeContent = page.url();
-    result.url = await doTest(typeContent, withItems, timeLimit, rules);
-    if (result.url.prevented) {
+  if (['new', 'both'].includes(contentType)) {
+    try {
+      console.log('>>>>>> With new content');
+      const typeContent = page.url();
+      result.url = await doTest(typeContent, withItems, timeLimit, rules);
+      if (result.url.prevented) {
+        result.prevented = true;
+        console.log(`ERROR: Getting ibm test report from URL timed out at ${timeLimit} seconds`);
+      }
+    }
+    catch(error) {
       result.prevented = true;
-      console.log(`ERROR: Getting ibm test report from URL timed out at ${timeLimit} seconds`);
+      console.log(`ERROR: ibm test on URL crashed with error ${error.message.slice(0, 200)}`);
     }
   }
   // Return the result. Execution of close() crashed the Node process.

package/watch.js

@@ -92,7 +92,7 @@ const checkNetJob = async watchee => {
     console.log(job.message);
   }
   else {
-    console.log(job);
+    console.log('No network job to do');
   }
   return job;
 };
@@ -138,7 +138,7 @@ const writeNetReport = async report => {
               error: 'ERROR: Response was not JSON',
               message: error.message,
               status: response.statusCode,
-              content: content.slice(0, 200)
+              content: content.slice(0, 3000)
             });
           }
         });
@@ -152,7 +152,8 @@ const writeNetReport = async report => {
         });
       });
       // Send the report to the server.
-      request.write(JSON.stringify(report, null, 2));
+      const reportJSON = JSON.stringify(report, null, 2);
+      request.write(reportJSON);
       request.end();
       console.log(`Report ${report.id} submitted`);
     }