testaro 74.2.3 → 75.1.0

package/testaro/legendLoc.js

@@ -22,7 +22,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     const parent = element.parentElement;
     // If the element violates the rule:
@@ -33,6 +33,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'Legend elements are not the first children of fieldset elements';
   return await doTest(
-    page, catalog, withItems, 'legendLoc', 'body legend', whats, 3, getBadWhat.toString()
+    page, report.catalog, withItems, 'legendLoc', 'body legend', whats, 3, getBadWhat.toString()
   );
 };

package/testaro/lineHeight.js

@@ -21,7 +21,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     // Get whether the element has a non-spacing child text node.
     const hasText = Array.from(element.childNodes).some(child =>
@@ -61,6 +61,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'Element line heights are less than 1.5 times their font sizes';
   return await doTest(
-    page, catalog, withItems, 'lineHeight', 'body, body *', whats, 1, getBadWhat.toString()
+    page, report.catalog, withItems, 'lineHeight', 'body, body *', whats, 1, getBadWhat.toString()
   );
 };

package/testaro/linkAmb.js

@@ -21,8 +21,8 @@ const {getXPathCatalogIndex} = require('../procs/xPath');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
-  const catalogIndex = getXPathCatalogIndex(catalog, '/html/body');
+exports.reporter = async (page, report, _, withItems) => {
+  const catalogIndex = getXPathCatalogIndex(report.catalog, '/html/body');
   return await page.evaluate(args => {
     const [withItems, catalogIndex] = args;
     // Get all links.

package/testaro/linkExt.js

@@ -19,13 +19,13 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     // Return a violation description.
     return `Link has a target=_blank attribute`;
   };
   const whats = 'Links have target=_blank attributes';
   return await doTest(
-    page, catalog, withItems, 'linkExt', 'body a[target=_blank]', whats, 0, getBadWhat.toString()
+    page, report.catalog, withItems, 'linkExt', 'body a[target=_blank]', whats, 0, getBadWhat.toString()
   );
 };

package/testaro/linkOldAtt.js

@@ -20,7 +20,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     const attNames = element.getAttributeNames();
     const allBadAttNames = ['charset', 'coords', 'name', 'rev', 'shape'];
@@ -39,6 +39,6 @@ exports.reporter = async (page, catalog, withItems) => {
   const selector = 'body a[charset], body a[coords], body a[name], body a[rev], body a[shape]';
   const whats = 'Links have deprecated attributes';
   return await doTest(
-    page, catalog, withItems, 'linkOldAtt', selector, whats, 1, getBadWhat.toString()
+    page, report.catalog, withItems, 'linkOldAtt', selector, whats, 1, getBadWhat.toString()
   );
 };

package/testaro/linkTo.js

@@ -18,7 +18,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     const isVisible = element.checkVisibility({
       contentVisibilityAuto: true,
@@ -33,6 +33,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'Links are missing href attributes';
   return await doTest(
-    page, catalog, withItems, 'linkTo', 'body a:not([href]', whats, 2, getBadWhat.toString()
+    page, report.catalog, withItems, 'linkTo', 'body a:not([href]', whats, 2, getBadWhat.toString()
   );
 };

package/testaro/linkUl.js

@@ -19,7 +19,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     let {display, textDecorationLine} = window.getComputedStyle(element);
     // If the element is not underlined:
@@ -44,6 +44,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'Links with adjacent text are not underlined';
   return await doTest(
-    page, catalog, withItems, 'linkUl', 'body a', whats, 1, getBadWhat.toString()
+    page, report.catalog, withItems, 'linkUl', 'body a', whats, 1, getBadWhat.toString()
   );
 };

package/testaro/miniText.js

@@ -22,7 +22,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     const rawText = element.textContent || '';
     // If the element has text content with any non-whitespace:
@@ -59,6 +59,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'Visible elements have font sizes smaller than 11 pixels';
   return await doTest(
-    page, catalog, withItems, 'miniText', 'body, body *:not(script, style)', whats, 2, getBadWhat.toString()
+    page, report.catalog, withItems, 'miniText', 'body, body *:not(script, style)', whats, 2, getBadWhat.toString()
   );
 };

package/testaro/motion.js

@@ -5,7 +5,7 @@
 
 /*
   motion
-  This test reports motion in a page by comparing the first and last of the screenshots previously made by the shoot0 and shoot1 tests.
+  This test reports motion in a page by making a page image and comparing it with the initial one, i.e. the one made by the catalog proc.
 
   For minimal accessibility, standards require motion to be brief, or else stoppable by the user. But stopping motion can be difficult or impossible, and, by the time a user manages to stop motion, the motion may have caused annoyance or harm. For superior accessibility, a page contains no motion until and unless the user authorizes it. The test reports a rule violation if any pixels differ between the screenshots. The larger the change fraction, the greater the ordinal severity.
 
@@ -15,54 +15,69 @@
 // IMPORTS
 
 const {getXPathCatalogIndex} = require('../procs/xPath');
-const fs = require('fs/promises');
-const blazediff = require('@blazediff/core').diff;
+const {shoot} = require('../procs/shoot');
+const pixelmatch = require('pixelmatch').default;
 const {PNG} = require('pngjs');
 
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (_0, catalog, _1, tmpDir) => {
+exports.reporter = async (page, report) => {
   // Initialize the totals and standard instances.
   const data = {};
   const totals = [0, 0, 0, 0];
   const standardInstances = [];
-  let violationWhat = '';
-  let ordinalSeverity = 0;
-  try {
-    // Get the screenshot PNG buffers made by the shoot0 and shoot1 tests.
-    let shoot0PNGBuffer = await fs.readFile(`${tmpDir}/testaro-shoot-0.png`);
-    let shoot1PNGBuffer = await fs.readFile(`${tmpDir}/testaro-shoot-1.png`);
-    // Delete the buffer files.
-    await fs.unlink(`${tmpDir}/testaro-shoot-0.png`);
-    await fs.unlink(`${tmpDir}/testaro-shoot-1.png`);
-    // If both buffers exist:
-    if (shoot0PNGBuffer && shoot1PNGBuffer) {
-      // Parse them into PNG objects.
-      let shoot0PNG = PNG.sync.read(shoot0PNGBuffer);
-      let shoot1PNG = PNG.sync.read(shoot1PNGBuffer);
-      const {width, height} = shoot0PNG;
+  // If the initial image exists:
+  if (report.images?.length) {
+    let violationWhat = '';
+    let ordinalSeverity = 0;
+    // Make an image with the same color type as the initial one and get its base64 encoding.
+    const png = await shoot(page, report, {
+      exclusionSelector: null,
+      colorType: report.imageColor,
+      action: 'return'
+    });
+    // If this succeeded:
+    if (png) {
+      // Parse both base64 encodings into PNG objects.
+      const initialPNG = PNG.sync.read(Buffer.from(report.images[0], 'base64'));
+      const finalPNG = PNG.sync.read(Buffer.from(png, 'base64'));
       // If their dimensions differ:
-      if (shoot1PNG.width !== width || shoot1PNG.height !== height) {
-        const fromSize = `${width}×${height}`;
-        const toSize = `${shoot1PNG.width}×${shoot1PNG.height}`;
+      if (finalPNG.width !== initialPNG.width || finalPNG.height !== initialPNG.height) {
+        const fromSize = `${initialPNG.width}×${initialPNG.height}`;
+        const toSize = `${finalPNG.width}×${finalPNG.height}`;
         // Describe the violation.
         violationWhat = `Page size changes spontaneously (from ${fromSize} to ${toSize})`;
       }
       // Otherwise, i.e. if their dimensions are identical:
       else {
-        // Get the count of differing pixels between the shots.
-        const pixelChanges = blazediff(shoot0PNG.data, shoot1PNG.data, null, width, height);
-        // Get the ratio of differing to all pixels as a percentage.
-        const changePercent = Math.round(100 * pixelChanges / (width * height));
-        // Free the memory used by screenshots.
-        shoot0PNG = shoot1PNG = shoot0PNGBuffer = shoot1PNGBuffer = null;
-        // If any pixels were changed:
-        if (pixelChanges) {
-          // Describe the violation.
-          violationWhat = `Content changes spontaneously (${changePercent}% of pixels changed)`;
-          // Get the ordinal severity from the fractional pixel change.
-          ordinalSeverity = Math.floor(Math.min(3, 0.4 * Math.sqrt(changePercent)));
+        // Get the count of differing pixels between the images, using the default sensitivity.
+        try {
+          const pixelChanges = pixelmatch(
+            initialPNG.data,
+            finalPNG.data,
+            null,
+            initialPNG.width,
+            initialPNG.height,
+            {
+              threshold: 0.1
+            }
+          );
+          // Get the ratio of differing to all pixels as a percentage.
+          const changePercent = Math.round(
+            100 * pixelChanges / (initialPNG.width * initialPNG.height)
+          );
+          // If any pixels were changed:
+          if (pixelChanges) {
+            // Describe the violation.
+            violationWhat = `Content changes spontaneously (${changePercent}% of pixels changed)`;
+            // Get the ordinal severity from the fractional pixel change.
+            ordinalSeverity = Math.floor(Math.min(3, 0.4 * Math.sqrt(changePercent)));
+          }
+        } catch (err) {
+          console.log(`pixelmatch error: ${err.message}, ${err.stack}`);
+          data.prevented = true;
+          data.error = `Pixel comparison failed: ${err.message}`;
         }
       }
       // If there was a violation:
@@ -75,22 +90,22 @@ exports.reporter = async (_0, catalog, _1, tmpDir) => {
           what: violationWhat,
           ordinalSeverity,
           count: 1,
-          catalogIndex: getXPathCatalogIndex(catalog, '/html/body')
+          catalogIndex: getXPathCatalogIndex(report.catalog, '/html/body')
         });
       }
     }
-    // Otherwise, i.e. if they do not both exist:
+    // Otherwise, i.e. if it failed:
     else {
       // Report this.
       data.prevented = true;
-      data.error = 'At least 1 screenshot missing';
+      data.error = 'Image creation failed';
     }
   }
-  // If getting or deleting either buffer file failed:
-  catch(error) {
+  // Otherwise, i.e. if the initial image does not exist:
+  else {
     // Report this.
     data.prevented = true;
-    data.error = `Screenshot file error (${error.message})`;
+    data.error = 'Initial image missing';
   }
   // Return the result.
   return {

package/testaro/nonTable.js

@@ -20,7 +20,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     // If the element contains another table:
     if (element.querySelector('table')) {
@@ -56,6 +56,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'table elements are misused for non-table content';
   return await doTest(
-    page, catalog, withItems, 'nonTable', 'body table', whats, 2, getBadWhat.toString()
+    page, report.catalog, withItems, 'nonTable', 'body table', whats, 2, getBadWhat.toString()
   );
 };

package/testaro/optRoleSel.js

@@ -22,7 +22,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     // If the element has no aria-selected attribute:
     if (! element.hasAttribute('aria-selected')) {
@@ -32,6 +32,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'Elements with role=option have no aria-selected attributes';
   return await doTest(
-    page, catalog, withItems, 'optRoleSel', 'body [role="option"]', whats, 1, getBadWhat.toString()
+    page, report.catalog, withItems, 'optRoleSel', 'body [role="option"]', whats, 1, getBadWhat.toString()
   );
 };

package/testaro/phOnly.js

@@ -22,7 +22,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     // Get the accessible name of the element.
     const accessibleName = window.getAccessibleName(element);
@@ -34,6 +34,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'input elements have placeholders but no accessible names';
   return await doTest(
-    page, catalog, withItems, 'phOnly', 'body input[placeholder]', whats, 2, getBadWhat.toString()
+    page, report.catalog, withItems, 'phOnly', 'body input[placeholder]', whats, 2, getBadWhat.toString()
   );
 };

package/testaro/pseudoP.js

@@ -18,7 +18,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     // Get the node before the element node.
     const previousNode = element.previousSibling;
@@ -49,6 +49,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'br elements follow other br elements, possibly constituting pseudo-paragraphs';
   return await doTest(
-    page, catalog, withItems, 'pseudoP', 'body br', whats, 0, getBadWhat.toString()
+    page, report.catalog, withItems, 'pseudoP', 'body br', whats, 0, getBadWhat.toString()
   );
 };

package/testaro/radioSet.js

@@ -19,7 +19,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     // Get the name of the element.
     const elName = element.name;
@@ -69,6 +69,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'Radio buttons are not validly grouped in fieldsets with legends';
   return await doTest(
-    page, catalog, withItems, 'radioSet', 'body input[type=radio]', whats, 2, getBadWhat.toString()
+    page, report.catalog, withItems, 'radioSet', 'body input[type=radio]', whats, 2, getBadWhat.toString()
   );
 };

package/testaro/role.js

@@ -25,7 +25,7 @@ const implicitRoles = new Set(Array.from(elementRoles.values()).flat());
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   // Get locators for the elements with explicit roles.
   const loc = page.locator('[role]');
   const locs = await loc.all();
@@ -44,5 +44,5 @@ exports.reporter = async (page, catalog, withItems) => {
   }
   // Get and return a result.
   const whats = 'Elements have roles assigned that are also implicit HTML element roles';
-  return await getBasicResult(catalog, withItems, 'role', 0, whats, {}, violations);
+  return await getBasicResult(report.catalog, withItems, 'role', 0, whats, {}, violations);
 };

package/testaro/secHeading.js

@@ -20,7 +20,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     // Get the children of the element.
     const children = Array.from(element.children);
@@ -44,6 +44,6 @@ exports.reporter = async (page, catalog, withItems) => {
   const selector = 'body section, body article, body nav, body aside, body main';
   const whats = 'First child headings of sectioning containers are deeper than others';
   return await doTest(
-    page, catalog, withItems, 'secHeading', selector, whats, 0, getBadWhat.toString()
+    page, report.catalog, withItems, 'secHeading', selector, whats, 0, getBadWhat.toString()
   );
 };

package/testaro/styleDiff.js

@@ -81,10 +81,10 @@ const linksByType = async page => await page.evaluateHandle(() => {
   };
 });
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   // Get an object with arrays of list links and adjacent links as properties.
   const linkTypes = await linksByType(page);
-  const catalogIndex = getXPathCatalogIndex(catalog, '/html/body');
+  const catalogIndex = getXPathCatalogIndex(report.catalog, '/html/body');
   return await page.evaluate(args => {
     const [linkTypes, withItems, catalogIndex] = args;
     const {body} = document;

package/testaro/tabNav.js

@@ -286,7 +286,7 @@ const testTabLists = async (tabLists, withItems, page) => {
   }
 };
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   // Initialize the results.
   data.totals = {
     navigations: {
@@ -374,7 +374,7 @@ exports.reporter = async (page, catalog, withItems) => {
         what: `Tab responds nonstandardly to ${item.navigationErrors.join(', ')}`,
         ordinalSeverity: 1,
         count: 1,
-        catalogIndex: getXPathCatalogIndex(catalog, item.xPath)
+        catalogIndex: getXPathCatalogIndex(report.catalog, item.xPath)
       });
     });
   }

package/testaro/targetsNear.js

@@ -20,7 +20,7 @@ const {getXPathCatalogIndex} = require('../procs/xPath');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   // Return totals and standard instances for the rule.
   const protoResult = await page.evaluate(withItems => {
     // Get all pointer targets.
@@ -142,7 +142,7 @@ exports.reporter = async (page, catalog, withItems) => {
   }, withItems);
   // Convert the XPaths of the proto-instances to catalog indexes.
   protoResult.standardInstances = protoResult.standardInstances.map(instance => {
-    instance.catalogIndex = getXPathCatalogIndex(catalog, instance.xPath);
+    instance.catalogIndex = getXPathCatalogIndex(report.catalog, instance.xPath);
     delete instance.xPath;
     return instance;
   });

package/testaro/textNodes.js

@@ -18,7 +18,7 @@
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, _, _, detailLevel, text = '') => {
+exports.reporter = async (page, _0, _1, _2, detailLevel, text = '') => {
   let data = {};
   // Get the data on the text nodes.
   try {

package/testaro/textSem.js

@@ -19,7 +19,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     const isVisible = element.checkVisibility({
       contentVisibilityAuto: true,
@@ -38,6 +38,6 @@ exports.reporter = async (page, catalog, withItems) => {
   const selector = 'body i, body b, body small';
   const whats = 'Semantically vague elements i, b, and/or small are used';
   return await doTest(
-    page, catalog, withItems, 'textSem', selector, whats, 0, getBadWhat.toString()
+    page, report.catalog, withItems, 'textSem', selector, whats, 0, getBadWhat.toString()
   );
 };

package/testaro/titledEl.js

@@ -20,7 +20,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     const elementType = element.tagName.toLowerCase();
     // Return a violation description.
@@ -29,6 +29,6 @@ exports.reporter = async (page, catalog, withItems) => {
   const selector = 'body [title]:not(iframe, link, style)';
   const whats = 'title attributes are used on elements they are likely ineffective on';
   return await doTest(
-    page, catalog, withItems, 'titledEl', selector, whats, 0, getBadWhat.toString()
+    page, report.catalog, withItems, 'titledEl', selector, whats, 0, getBadWhat.toString()
   );
 };

package/testaro/zIndex.js

@@ -20,7 +20,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, catalog, withItems) => {
+exports.reporter = async (page, report, _, withItems) => {
   const getBadWhat = element => {
     // Get whether the element violates the rule.
     const styleDec = window.getComputedStyle(element);
@@ -33,6 +33,6 @@ exports.reporter = async (page, catalog, withItems) => {
   };
   const whats = 'Elements have non-default Z indexes';
   return await doTest(
-    page, catalog, withItems, 'zIndex', 'body, body *', whats, 0, getBadWhat.toString()
+    page, report.catalog, withItems, 'zIndex', 'body, body *', whats, 0, getBadWhat.toString()
   );
 };

package/tests/testaro.js

@@ -23,15 +23,6 @@ const {launch} = require('../procs/launch');
 
 // Metadata of all rules in default execution order.
 const allRules = [
-  {
-    id: 'shoot0',
-    what: 'first page screenshot',
-    contaminates: false,
-    needsAccessibleName: false,
-    needsTmpDir: true,
-    timeOut: 5,
-    defaultOn: true
-  },
   {
     id: 'adbID',
     what: 'elements with ambiguous or missing referenced descriptions',
@@ -328,21 +319,11 @@ const allRules = [
     timeOut: 5,
     defaultOn: true
   },
-  {
-    id: 'shoot1',
-    what: 'second page screenshot',
-    contaminates: false,
-    needsAccessibleName: false,
-    needsTmpDir: true,
-    timeOut: 5,
-    defaultOn: true
-  },
   {
     id: 'motion',
-    what: 'motion without user request, measured across tests',
+    what: 'motion without user request',
     contaminates: false,
     needsAccessibleName: false,
-    needsTmpDir: true,
     timeOut: 5,
     defaultOn: true
   },
@@ -459,14 +440,6 @@ process.on('unhandledRejection', reason => {
 
 // FUNCTIONS
 
-// Waits.
-const wait = ms => {
-  return new Promise(resolve => {
-    setTimeout(() => {
-      resolve('');
-    }, ms);
-  });
-};
 // Conducts and reports Testaro tests.
 exports.reporter = async (page, report, actIndex) => {
   const act = report.acts[actIndex];
@@ -578,13 +551,13 @@ exports.reporter = async (page, report, actIndex) => {
         browser.on('disconnected', disconnectHandler);
       }
       // Initialize an argument array for the reporter.
-      const ruleArgs = [page, report.catalog, withItems];
+      const ruleArgs = [page, report, actIndex, withItems];
       // If the rule needs a temporary directory:
       if (rule.needsTmpDir) {
         // Add its path to the argument array.
         ruleArgs.push(report.jobData.tmpDir);
       }
-      // If the rule has extra arguments:
+      // If the testaro test act specifies extra arguments for this rule:
       if (argRules?.includes(ruleResult.id)) {
         // Add them to the argument array.
         ruleArgs.push(... args[ruleResult.id]);

package/testaro/shoot0.js

@@ -1,27 +0,0 @@
-/*
-  © 2025–2026 Jonathan Robert Pool.
-  Licensed under the MIT License. See LICENSE file for details.
-*/
-
-/*
-  shoot0
-  This test makes and saves the first of two screenshots.
-*/
-
-// IMPORTS
-
-const {shoot} = require('../procs/shoot');
-
-// FUNCTIONS
-
-// Makes and saves the first screenshot.
-exports.reporter = async (page, _, __, tmpDir) => {
-  // Make and save the screenshot.
-  const pngPath = await shoot(page, 0, tmpDir);
-  // Return whether the screenshot was prevented.
-  return {
-    data: {
-      prevented: ! pngPath
-    }
-  };
-};

package/testaro/shoot1.js

@@ -1,33 +0,0 @@
-/*
-  © 2025–2026 Jonathan Robert Pool.
-  Licensed under the MIT License. See LICENSE file for details.
-*/
-
-/*
-  shoot1
-  This test makes and saves the second of two screenshots. It aborts if the first screenshot was prevented.
-*/
-
-// IMPORTS
-
-const fs = require('fs/promises');
-const {shoot} = require('../procs/shoot');
-
-// FUNCTIONS
-
-// Make and save the second screenshot.
-exports.reporter = async (page, _0, _1, tmpDir) => {
-  const tempFileNames = await fs.readdir(tmpDir);
-  let pngPath = '';
-  // If there is a shoot0 file:
-  if (tempFileNames.includes('testaro-shoot-0.png')) {
-    // Make and save the screenshot.
-    pngPath = await shoot(page, 1, tmpDir);
-  }
-  // Return whether the screenshot was prevented.
-  return {
-    data: {
-      prevented: ! pngPath
-    }
-  };
-};