testilo 30.1.0 → 31.0.1

package/README.md

@@ -745,25 +745,25 @@ const {track} = require('testilo/track');
 const trackerDir = `${process.env.FUNCTIONDIR}/track/ttp99a`;
 const {tracker} = require(`${trackerDir}/index`);
 const summaryReport = …;
-const [reportID, trackReport] = track(tracker, summaryReport);
+const [reportID, 'main competitors', trackReport] = track(tracker, summaryReport);
 ```
 
-The `track()` function returns an ID and an HTML tracking report that shows data for all of the results in the summary report. The invoking module can further dispose of the tracking report as needed.
+The `track()` function returns an ID and an HTML tracking report that shows data for all of the results in the summary report and identifies “main competitors” as its subject. The invoking module can further dispose of the tracking report as needed.
 
 ##### By a user
 
 A user can invoke `track()` in one of these ways:
 
 ```javaScript
-node call track ttp99a
-node call track ttp99a 241016
-node call track ttp99a 241016 'ABC Foundation'
+node call track ttp99a 'main competitors'
+node call track ttp99a 'main competitors' 241016
+node call track ttp99a 'main competitors' 241016 'ABC Foundation'
 ```
 
 When a user invokes `track()` in this example, the `call` module:
 - gets the summary report from the last file in the `summarized` subdirectory of the `REPORTDIR` directory, or if the third argument to `call()` exists the last one whose name begins with `'241016'`.
 - selects the summarized data for all results in the summary report, or if the fourth argument to `call()` exists from all results whose `target.what` property has the value `'ABC Foundation'`.
-- uses tracker `ttp99a` to create a tracking report.
+- uses tracker `ttp99a` to create a tracking report that identifies “main competitors” as its subject.
 - assigns an ID to the tracking report.
 - writes the tracking report to the `tracking` subdirectory of the `REPORTDIR` directory, with the ID as the base of its file name.
 

package/call.js

@@ -309,24 +309,24 @@ const callCompare = async (what, compareProcID, selector) => {
   }
 };
 // Fulfills a tracking request.
-const callTrack = async (trackerID, selector, targetWhat) => {
+const callTrack = async (trackerID, what, selector, targetWhat) => {
   // Get the summary report.
   try {
     const summaryReport = await getSummaryReport(selector);
-    // Remove unwanted results from it.
-    summaryReport.summaries = summaryReport.summaries.filter(
-      result => targetWhat
-      ? result.sources
-      && result.sources.target
-      && result.sources.target.what === targetWhat
-      : true
-    );
+    // Remove unwanted results, if any, from it.
+    if (targetWhat) {
+      summaryReport.summaries = summaryReport.summaries.filter(
+        result => result.sources
+        && result.sources.target
+        && result.sources.target.what === targetWhat
+      );
+    }
     // If any results remain:
     if (summaryReport.summaries.length) {
       // Get the tracker.
       const {tracker} = require(`${functionDir}/track/${trackerID}/index`);
       // Track the results.
-      const [reportID, trackingReport] = await track(tracker, summaryReport);
+      const [reportID, trackingReport] = await track(tracker, what, summaryReport);
       // Save the tracking report.
       await fs.mkdir(`${reportDir}/tracking`, {recursive: true});
       const reportPath = `${reportDir}/tracking/${reportID}.html`;
@@ -429,14 +429,14 @@ else if (fn === 'compare' && fnArgs.length === 3) {
     console.log('Execution completed');
   });
 }
-else if (fn === 'credit' && fnArgs.length > 0 && fnArgs.length < 3) {
-  callCredit(... fnArgs)
+else if (fn === 'track' && fnArgs.length > 2 && fnArgs.length < 6) {
+  callTrack(... fnArgs)
   .then(() => {
     console.log('Execution completed');
   });
 }
-else if (fn === 'track' && fnArgs.length > 1 && fnArgs.length < 5) {
-  callTrack(... fnArgs)
+else if (fn === 'credit' && fnArgs.length > 0 && fnArgs.length < 3) {
+  callCredit(... fnArgs)
   .then(() => {
     console.log('Execution completed');
   });

package/merge.js

@@ -7,7 +7,7 @@
 
 // Module to keep secrets.
 require('dotenv').config();
-// Module to perform common actions.
+// Utility module.
 const {alphaNumOf, dateOf, getRandomString, getNowStamp} = require('./procs/util');
 
 // ########## CONSTANTS
@@ -119,12 +119,13 @@ exports.merge = (script, batch, standard, observe, requester, timeStamp) => {
       // Add other properties to the job.
       job.mergeID = mergeID;
       job.sendReportTo = process.env.SEND_REPORT_TO || '';
-      // Add data to the sources property of the job.
-      job.sources.target.id = targetID;
+      // If the target is the last one:
       if (index === targets.length - 1) {
-        // Add that fact to the job.
+        // Add that fact to the sources property of the job.
         job.sources.lastTarget = true;
       }
+      // Add other data to the sources property of the job.
+      job.sources.target.id = targetID;
       job.sources.target.what = target.what;
       job.sources.target.which = target.which;
       // Replace each placeholder object in the job with the named replacer array of the target.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "30.1.0",
+  "version": "31.0.1",
   "description": "Prepares and processes Testaro reports",
   "main": "call.js",
   "scripts": {

package/procs/score/tic40.js

@@ -88,49 +88,49 @@ exports.issues = {
         },
         'frame-tested': {
           variable: false,
-          quality: 0.2,
+          quality: 0,
           what: 'Some content is in an iframe and so may not be testable for accessibility [speculative]'
         },
         'hidden-content': {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Some content is hidden and so may not be testable for accessibility [speculative]'
         }
       },
       ed11y: {
         altNull: {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'img element not inside a link has an empty alt attribute [speculative]'
         },
         altPartOfLinkWithText: {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Name of the link enclosing the img element includes its alt attribute, so may be unclear [speculative]'
         },
         embedAudio: {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Element is audio, so may lack an accurate transcript [speculative]'
         },
         embedCustom: {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Embedded custom element may fail to be accessible [speculative]'
         },
         embedTwitter: {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Element is a Twitter feed, so may add many items on scroll and thus be impractical to exit by keyboard [speculative]'
         },
         embedVideo: {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Element is video, so may lack captions [speculative]'
         },
         embedVisualization: {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Element is a visualization, so may lack a nonvisual equivalent [speculative]'
         }
       },
@@ -164,29 +164,34 @@ exports.issues = {
         },
         'QW-ACT-R64': {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Document has no heading for non-repeated content'
         },
         'QW-ACT-R73': {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Block of repeated content is not collapsible [invalid]'
         },
         'QW-ACT-R74': {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Document has no instrument to move focus to non-repeated content [invalid]'
         },
         'QW-ACT-R75': {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'Blocks of repeated content cannot be bypassed [invalid]'
         },
         'QW-BP1': {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'h1-h6 not used to identify headings [invalid]'
         },
+        'QW-BP29': {
+          variable: false,
+          quality: 0,
+          what: 'lang and xml:lang attribute of html element differ [invalid]'
+        },
         'QW-WCAG-T4': {
           variable: false,
           quality: 0,
@@ -209,7 +214,7 @@ exports.issues = {
         },
         'QW-WCAG-T23': {
           variable: false,
-          quality: 1,
+          quality: 0,
           what: 'No link at the top of the page goes directly to the main content area [invalid]'
         }
       }

package/procs/track/ttp40/index.html

@@ -18,7 +18,7 @@
         <h1>Accessibility tracking report</h1>
       </header>
       <h2>Introduction</h2>
-      <p>This is tracking report <code>__id__</code>.</p>
+      <p>This is tracking report <code>__id__</code>, for __what__.</p>
       <p>It tracks accessibility scores over time. A perfect score is 0. The tracking was performed by Testilo procedure <code>__tp__</code>.</p>
       <p>The results are presented first as a graph, and then as a table.</p>
       <h2>Results as a graph</h2>
@@ -67,7 +67,6 @@
           <tr>
             <th>Date and time</th>
             <th>Score</th>
-            <th>Order</th>
             <th>Target</th>
           </tr>
         </thead>

package/procs/track/ttp40/index.js

@@ -21,9 +21,10 @@ const digestURL = process.env.DIGEST_URL;
 // FUNCTIONS
 
 // Adds parameters to a query for a tracking report.
-const populateQuery = async (id, summaryReport, query) => {
+const populateQuery = async (id, what, summaryReport, query) => {
   // General parameters.
   query.id = id;
+  query.what = what;
   query.tp = trackerID;
   query.dateISO = getNowDate();
   query.dateSlash = getNowDateSlash();
@@ -41,12 +42,11 @@ const populateQuery = async (id, summaryReport, query) => {
     const timeCell = `<td>${result.endTime}</td>`;
     const digestLinkDestination = digestURL.replace('__id__', result.id);
     const scoreCell = `<td><a href=${digestLinkDestination}>${result.score}</a></td>`;
-    const orderCell = `<td class="center">${result.order}</td>`;
     const {target} = result.sources;
     const targetID = alphaNumOf(targetWhats.indexOf(target.what));
     const targetLink = `<a href="${target.which}">${target.what}</a>`;
     const targetCell = `<td>${targetID}: ${targetLink}</td>`;
-    const row = `<tr>${[timeCell, scoreCell, orderCell, targetCell].join('')}</tr>`;
+    const row = `<tr>${[timeCell, scoreCell, targetCell].join('')}</tr>`;
     // Add the row to the array of rows.
     rows.push(row);
   });
@@ -54,10 +54,10 @@ const populateQuery = async (id, summaryReport, query) => {
   query.scoreRows = rows.join(innerJoiner);
 };
 // Returns a tracking report.
-exports.tracker = async (id, summaryReport) => {
+exports.tracker = async (id, what, summaryReport) => {
   // Create a query to replace placeholders.
   const query = {};
-  await populateQuery(id, summaryReport, query);
+  await populateQuery(id, what, summaryReport, query);
   // Get the template.
   let template = await fs.readFile(`${__dirname}/index.html`, 'utf8');
   // Replace its placeholders.

package/track.js

@@ -14,9 +14,9 @@ const {getFileID} = require('./procs/util');
 // ########## FUNCTIONS
 
 // Creates and returns a tracking report from a summary.
-exports.track = async (tracker, summaryReport) => {
+exports.track = async (tracker, what, summaryReport) => {
   // Use the tracker to create a tracking report.
   const id = getFileID(2);
-  const trackingReport = await tracker(id, summaryReport);
+  const trackingReport = await tracker(id, what, summaryReport);
   return [id, trackingReport];
 };