testaro 47.2.1 → 48.0.0

package/tests/alfa.js

@@ -34,8 +34,7 @@ const {doBy} = require('../procs/job');
 // FUNCTIONS
 
 // Conducts and reports the alfa tests.
-exports.reporter = async (page, report, actIndex, timeLimit) => {
-  const act = report.acts[actIndex];
+exports.reporter = async (page, act) => {
   const {rules} = act;
   const alfaRulesModule = await import('@siteimprove/alfa-rules');
   const alfaRules = alfaRulesModule.default;
@@ -62,9 +61,7 @@ exports.reporter = async (page, report, actIndex, timeLimit) => {
   };
   try {
     // Get the Alfa rules.
-    const response = await rulePage.goto(
-      'https://alfa.siteimprove.com/rules', {timeout: Math.round(1000 * timeLimit / 2)}
-    );
+    const response = await rulePage.goto('https://alfa.siteimprove.com/rules', {timeout: 10000});
     let ruleData = {};
     // If they were obtained:
     if (response.status() === 200) {
@@ -96,7 +93,7 @@ exports.reporter = async (page, report, actIndex, timeLimit) => {
     const alfaActModule = await import('@siteimprove/alfa-act');
     const {Audit} = alfaActModule;
     const audit = Audit.of(alfaPage, alfaRules);
-    const outcomes = Array.from(await doBy(timeLimit, audit, 'evaluate', [], 'alfa testing'));
+    const outcomes = Array.from(await doBy(10, audit, 'evaluate', [], 'alfa testing'));
     // If the testing finished on time:
     if (outcomes !== 'timedOut') {
       // For each failure or warning:

package/tests/ibm.js

@@ -52,15 +52,21 @@ const run = async (content, timeLimit) => {
     const ibmReport = await doBy(
       timeLimit, accessibilityChecker, 'getCompliance', [content, nowLabel], 'ibm getCompliance'
     );
-    if (ibmReport !== 'timedOut') {
+    if (typeof ibmReport === 'object' && ibmReport.report) {
       return ibmReport;
     }
-    else {
+    else if (ibmReport === 'timedOut') {
       return {
         prevented: true,
         error: `ibm getCompliance timed out at ${timeLimit} seconds`
       };
     }
+    else {
+      return {
+        prevented: true,
+        error: 'ibm getCompliance produced no report'
+      };
+    }
   }
   catch(error) {
     console.log('ibm getCompliance failed');
@@ -207,9 +213,8 @@ exports.reporter = async (page, report, actIndex, timeLimit) => {
       // If the act was prevented:
       if (data && data.prevented) {
         // Report this.
-        const message = `ERROR: Act failed or timed out at ${timeLimit} seconds`;
-        console.log(message);
-        data.error = data.error ? `${data.error}; ${message}` : message;
+        const message = 'ERROR: Act was prevented';
+        data.error ??= message;
         // Return the failure.
         return {
           data,

package/validation/executors/run.js

@@ -41,9 +41,9 @@ const jobID = '240101T1200-simple-example';
 // Get the simple job.
 fs.readFile(`${__dirname}/../jobs/todo/${jobID}.json`, 'utf8')
 .then(async jobJSON => {
-  const report = JSON.parse(jobJSON);
+  const job = JSON.parse(jobJSON);
   // Run it.
-  await doJob(report);
+  const report = await doJob(job);
   try {
     // Check the report against expectations.
     const {acts, jobData} = report;

package/validation/validateTest.js

@@ -44,7 +44,7 @@ exports.validateTest = async testID => {
     const jobJSON = await fs.readFile(`${__dirname}/tests/jobs/${jobFileName}`, 'utf8');
     const report = JSON.parse(jobJSON);
     // Perform it.
-    await doJob(report);
+    report = await doJob(report);
     // Report whether the end time was reported.
     const {acts, jobData} = report;
     if (jobData.endTime && /^(?:\d{2}-){2}\d{2}T\d{2}:\d{2}$/.test(jobData.endTime)) {