testaro 3.0.0 → 3.0.1

package/README.md

@@ -49,7 +49,7 @@ As of this version, the counts of tests in the packages referenced above were:
 
 ## Related packages
 
-[Testilo](https://github.com/jrpool/testilo) is an application that facilitates the use of Testaro.
+[Testilo](https://www.npmjs.com/package/testilo) is an application that facilitates the use of Testaro.
 
 ## Code organization
 
@@ -461,6 +461,9 @@ Further development is contemplated, is taking place, or is welcomed, on:
 - buttons with no text content
 - modal dialogs
 - autocomplete attributes
+- inclusion of other test packages, such as:
+   - FAE (https://github.com/opena11y/evaluation-library)
+   - Tenon
 
 ## Testing challenges
 

package/commands.js

@@ -185,7 +185,7 @@ exports.commands = {
       {
         withItems: [true, 'boolean'],
         withNewContent: [
-          false, 'boolean', '', 'true: use a URL; false: use page content; omitted: use both'
+          false, 'boolean', '', 'true: use a URL; false: use page content; omitted: both'
         ]
       }
     ],

package/package.json

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

package/samples/scripts/simple.json

@@ -1,5 +1,5 @@
 {
-  "what": "Test example.com with alfa",
+  "what": "Test example.com with bulk",
   "strict": true,
   "commands": [
     {
@@ -14,8 +14,7 @@
     },
     {
       "type": "test",
-      "which": "alfa",
-      "what": "Siteimprove alfa package"
+      "which": "bulk"
     }
   ]
 }

package/tests/ibm.js

@@ -50,28 +50,54 @@ const report = (result, withItems) => {
   }
   return data;
 };
-const all = {};
-// Returns results of an IBM test.
+// Performs an IBM test.
+const doTest = async (content, withItems, timeLimit) => {
+  // Start a timeout clock.
+  let timeoutID;
+  const wait = new Promise(resolve => {
+    timeoutID = setTimeout(() => {
+      resolve('');
+    }, 1000 * timeLimit);
+  });
+  // Conduct and report the test.
+  const result = run(content);
+  // Wait for the report until the time limit expires.
+  const resultIfFast = await Promise.race([result, wait]);
+  // Delete the report files.
+  try {
+    const reportNames = await fs.readdir('results');
+    for (const reportName of reportNames) {
+      await fs.rm(`results/${reportName}`);
+    }
+  }
+  catch(error) {
+    console.log('ibm test created no result files.');
+  }
+  // Return the result.
+  if (resultIfFast) {
+    clearTimeout(timeoutID);
+    const typeResult = report(result, withItems);
+    return typeResult;
+  }
+  else {
+    console.log('ERROR: getting ibm test report took too long');
+    return 'ERROR: getting ibm test report took too long';
+  }
+};
+// Returns results of one or two IBM tests.
 exports.reporter = async (page, withItems, withNewContent) => {
-  // If the test is to be conducted with existing content:
+  // If a test with existing content is to be performed:
+  const result = {};
   if (! withNewContent) {
-    // Conduct and report it.
-    const content = await page.content();
-    const result = await run(content);
-    all.content = report(result, withItems);
+    const timeLimit = 15;
+    const typeContent = await page.content();
+    result.content = await doTest(typeContent, withItems, timeLimit);
   }
-  // If the test is to be conducted with a URL:
+  // If a test with new content is to be performed:
   if ([true, undefined].includes(withNewContent)) {
-    // Conduct and report it.
-    const content = page.url();
-    const result = await run(content);
-    all.url = report(result, withItems);
+    const timeLimit = 20;
+    const typeContent = page.url();
+    result.url = await doTest(typeContent, withItems, timeLimit);
   }
-  // Delete the report files.
-  const reportNames = await fs.readdir('results');
-  for (const reportName of reportNames) {
-    await fs.rm(`results/${reportName}`);
-  }
-  // Return the result.
-  return {result: all};
+  return {result};
 };