@jrpool/kilotest 43.0.2 → 44.0.1

package/web/{recActionForm → enqueueForm}/index.html

@@ -14,7 +14,7 @@
     <main>
       <h1><a href="/">Kilotest</a>: Recommendation approval or rejection</h1>
       <p>To approve a test or retest recommendation, check its recommended page name.</p>
-      <p>To approve testing a page that is not yet recommended, first <a href="targets.html">recommend it</a>.</p>
+      <p>To approve testing a page that is not yet recommended, first <a href="listReports.html">recommend it</a>.</p>
       <p>To reject all recommendations for a page, check the radio button of its URL.</p>
       <form action="/recAction.html" method="post">
         <fieldset>

package/web/{recActionForm → enqueueForm}/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Serves a form for ordering a recommended test.
+  Serves a form for approving or rejecting a test request.
 */
 
 // IMPORTS

package/web/{reportsExpungeForm → expungeReportsForm}/index.html

@@ -14,7 +14,7 @@
     <main>
       <h1><a href="/">Kilotest</a>: Expunge reports</h1>
       <p>__intro__</p>
-      <form action="/reportsExpungeForm.html">
+      <form action="/expungeReportsForm.html">
         <fieldset>
           <legend>Reports</legend>
           __reports__

package/web/{reportsExpungeForm → expungeReportsForm}/index.js

@@ -54,7 +54,7 @@ exports.answer = async (_, search) => {
     const [timeStamp, jobID] = reportName.slice(0, -5).split('-');
     // Get a summary of it.
     const reportFacts = await getReportData(timeStamp, jobID);
-    const {error, issueCount, preventedToolCount, url} = reportFacts;
+    const {error, issueCount, preventedEngineCount, url} = reportFacts;
     // If this failed:
     if (error) {
       // Return why.
@@ -67,7 +67,7 @@ exports.answer = async (_, search) => {
       timeStamp,
       jobID,
       issueCount,
-      preventedToolCount,
+      preventedEngineCount,
       url
     });
   }
@@ -79,9 +79,9 @@ exports.answer = async (_, search) => {
   let anyDeletable = false;
   // For each summary:
   reportSpecs.forEach((spec, index) => {
-    const {timeStamp, jobID, issueCount, preventedToolCount, url} = spec;
+    const {timeStamp, jobID, issueCount, preventedEngineCount, url} = spec;
     const jobName = `${timeStamp}-${jobID}`;
-    const specString = `<code>${url}</code> (<code>${jobName}</code>): preventions ${preventedToolCount}, issues ${issueCount}`;
+    const specString = `<code>${url}</code> (<code>${jobName}</code>): preventions ${preventedEngineCount}, issues ${issueCount}`;
     // If its report is the sole report on a target:
     if (reportSpecs[index - 1]?.url !== url && reportSpecs[index + 1]?.url !== url) {
       // Add a line with a deletion checkbox.

package/web/{reportHideForm → hideReportForm}/index.html

@@ -14,7 +14,7 @@
     <main>
       <h1><a href="/">Kilotest</a>: Classify report as experimental</h1>
       <p>Choose a report to classify as experimental.</p>
-      <form action="/reportHideForm.html">
+      <form action="/hideReportForm.html">
         <fieldset>
           <legend>Reports</legend>
           __reports__

package/web/{diagnoses → listDiagnoses}/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Answers the diagnoses question.
+  Lists the diagnoses of a violator of an issue in a report.
 */
 
 // IMPORTS
@@ -13,7 +13,7 @@ const {
   getWeightName,
   htmlSafe,
   isHidden,
-  tools
+  ruleEngines
 } = require('../../util');
 const {issues: issueSpecs} = require('testaro-issues');
 const fs = require('fs/promises');
@@ -107,7 +107,7 @@ const populateQuery = async (issueID, timeStamp, jobID, catalogIndex, pathID, qu
       const {ruleID, what} = instance;
       // Add lines for it to the array.
       diagnoses.push({
-        toolID: which,
+        engineID: which,
         ruleID,
         what
       });
@@ -115,10 +115,12 @@ const populateQuery = async (issueID, timeStamp, jobID, catalogIndex, pathID, qu
   });
   // For each diagnosis:
   diagnoses.forEach(diagnosis => {
-    const {toolID, ruleID, what} = diagnosis;
+    const {engineID, ruleID, what} = diagnosis;
     // Add lines.
     lines.push(`${margin}<li>${htmlSafe(what)}`);
-    lines.push(`${margin}  <p>Tool: ${tools[toolID][0]} (${tools[toolID][1]})</p>`);
+    lines.push(
+      `${margin}  <p>Rule engine: ${ruleEngines[engineID][0]} (${ruleEngines[engineID][1]})</p>`
+    );
     if (ruleID !== what) {
       lines.push(`${margin}  <p>Rule: <code>${ruleID}</code></p>`);
     }

package/web/{reportIssues → listIssues}/index.html

@@ -19,7 +19,7 @@
         <li>__testInfo__</li>
         __preventions__
       </ul>
-      <p><a href="/retestRecForm.html/__timeStamp__/__jobID__">Should Kilotest retest the page?</a></p>
+      <p><a href="/requestRetestForm.html/__timeStamp__/__jobID__">Should Kilotest retest the page?</a></p>
       <h2>Issues reported</h2>
       <h3>Summary</h3>
       <p>__reporterCount__ reported issues (__reporters__)</p>

package/web/{reportIssues → listIssues}/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Answers the report-issues question.
+  List the issues in a report.
 */
 
 // IMPORTS
@@ -9,14 +9,14 @@ const {
   getPageData,
   getPageDataStrings,
   getReport,
-  getToolList,
+  getEngineList,
   getWCAGLink,
   getWeightName,
   htmlSafe,
   isHidden,
   isValidReport,
   objectSort,
-  tools
+  ruleEngines
 } = require('../../util');
 const {issues: issueSpecs} = require('testaro-issues');
 const fs = require('fs/promises');
@@ -82,7 +82,7 @@ const getIssuesData = async (timeStamp, jobID) => {
                 reporterList: '',
                 violators: new Set()
               };
-              // Ensure the tool is in the temporary data.
+              // Ensure the rule engine is in the temporary data.
               temp.issues[issueID].reporters.add(which);
               temp.reporters.add(which);
               // If the instance has a catalog index:
@@ -97,7 +97,7 @@ const getIssuesData = async (timeStamp, jobID) => {
       }
     });
     // Finish populating the final data.
-    final.reporterList = getToolList(temp.reporters);
+    final.reporterList = getEngineList(temp.reporters);
     final.reporterCount = temp.reporters.size;
     final.violatorCount = temp.violators.size;
     Object.values(temp.issues).forEach(issue => {
@@ -109,7 +109,7 @@ const getIssuesData = async (timeStamp, jobID) => {
         why,
         weight
       };
-      finalIssue.reporterList = getToolList(issue.reporters);
+      finalIssue.reporterList = getEngineList(issue.reporters);
       finalIssue.reporterCount = issue.reporters.size;
       finalIssue.violatorCount = issue.violators.size;
       final.issues[issue.weight].push(finalIssue);
@@ -183,11 +183,11 @@ const populateQuery = async (timeStamp, jobID, query) => {
   // Initialize strings for the prevention notices query property.
   const preventionStrings = [];
   const margin = ' '.repeat(6);
-  Object.keys(preventions).forEach(preventedToolID => {
-    const toolName = tools[preventedToolID];
-    const toolNameString = `${toolName[0]} (${toolName[1]})`;
-    const causeString = htmlSafe(preventions[preventedToolID]);
-    const preventionString = `${margin}<li>Page not testable by ${toolNameString}: ${causeString}</li>`;
+  Object.keys(preventions).forEach(preventedEngineID => {
+    const engineName = ruleEngines[preventedEngineID];
+    const engineNameString = `${engineName[0]} (${engineName[1]})`;
+    const causeString = htmlSafe(preventions[preventedEngineID]);
+    const preventionString = `${margin}<li>Page not testable by ${engineNameString}: ${causeString}</li>`;
     preventionStrings.push(preventionString);
   });
   // Add prevention notices to the query.
@@ -252,7 +252,7 @@ const populateQuery = async (timeStamp, jobID, query) => {
         detailsLines.push(`${margin}    <ul class="nav">`);
         const whereQuestionString = 'Where was the issue found?';
         const labelString = `Where was the ${summary} issue found on the ${what} page?`;
-        const href = `href="/reportIssue.html/${issueID}/${timeStamp}/${jobID}"`;
+        const href = `href="/listViolators.html/${issueID}/${timeStamp}/${jobID}"`;
         const label = `aria-label="${labelString}"`;
         const whereLink = `<a ${href} ${label}>${whereQuestionString}</a>`;
         // Add a violations link to the lines.

package/web/{targets → listReports}/index.html

@@ -18,7 +18,7 @@
         __recs__
       </ol>
       <p>__noRecs__</p>
-      <p>Should Kilotest <a href="testRecForm.html">test a page</a> that is not listed below?</p>
+      <p>Should Kilotest <a href="requestTestForm.html">test a page</a> that is not listed below?</p>
       <h2>Queued for testing</h2>
       <ol>
         __queue__

package/web/{targets → listReports}/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Answers the targets question.
+  Lists all available reports.
 */
 
 // IMPORTS
@@ -51,7 +51,7 @@ const populateQuery = async query => {
   query.recs = lines.recs.join('\n');
   // Add a no-recommendations message, if applicable, to the query.
   query.noRecs = lines.recs.length
-  ? 'Kilotest managers can <a href="recActionForm.html">approve or reject a recommendation</a>.'
+  ? 'Kilotest managers can <a href="enqueueForm.html">approve or reject a recommendation</a>.'
   : 'No recommendations await approval now.';
   // Get the file names of all queued and claimed jobs.
   const jobFileNames = await getJobNames();
@@ -90,8 +90,8 @@ const populateQuery = async query => {
     const {
       error,
       issueCount,
-      preventedToolCount,
-      preventedToolNames,
+      preventedEngineCount,
+      preventedEngineNames,
       reporterNames,
       reporterCount,
       violatorCount
@@ -116,16 +116,16 @@ const populateQuery = async query => {
     lines.tested.push(`${margin}    <li>URL: ${urlLink}</li>`);
     // Add facts about the report to the lines.
     lines.tested.push(`${margin}    <li>${testInfo}</li>`);
-    // If the page prevented any tool from performing its tests:
-    if (preventedToolCount) {
+    // If the page prevented any rule engine from performing its tests:
+    if (preventedEngineCount) {
       // Add this to the lines.
-      const toolCountString = getCountString(preventedToolCount, 'tool', 'tools');
+      const engineCountString = getCountString(preventedEngineCount, 'rule engine', 'rule engines');
       lines.tested.push(
-        `${margin}    <li>Page not testable by ${toolCountString} (${preventedToolNames.join(' + ')})</li>`,
+        `${margin}    <li>Page not testable by ${engineCountString} (${preventedEngineNames.join(' + ')})</li>`,
       );
     }
     // Add facts about the test results to the lines.
-     let reporterString = `${getCountString(reporterCount, 'tool', 'tools')} reported issues`;
+     let reporterString = `${getCountString(reporterCount, 'rule engine', 'rule engines')} reported issues`;
     if (reporterCount) {
       const reporterNamesString = reporterNames.join(' + ');
       reporterString = `${reporterString} (${reporterNamesString})`;
@@ -140,7 +140,7 @@ const populateQuery = async query => {
     // If any issues were reported:
     if (issueCount) {
       // Add a question link about the reported issues to the lines.
-      const href = `href="reportIssues.html/${timeStamp}/${jobID}"`;
+      const href = `href="listIssues.html/${timeStamp}/${jobID}"`;
       const label = `aria-label="What ${issueCountString} reported for the ${what} page?"`;
       const questionString = issueCount === 1 ? 'was the issue' : 'were the issues';
       const link = `<a ${href} ${label}>What ${questionString}?</a>`;
@@ -156,7 +156,7 @@ const populateQuery = async query => {
       retestString = 'Currently in the queue for retesting';
     }
     else {
-      const href = `/retestRecForm.html/${timeStamp}/${jobID}`;
+      const href = `/requestRetestForm.html/${timeStamp}/${jobID}`;
       const retestContent = 'Should Kilotest retest the page?';
       retestString = `<a href="${href}">${retestContent}</a>`;
     }

package/web/{rules → listRules}/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Answers the issue-rules question.
+  List the rules belonging to an issue.
 */
 
 // IMPORTS

package/web/{issues → listTopIssues}/index.js

@@ -1,15 +1,15 @@
 /*
   index.js
-  Answers the issues question.
+  Lists the most commonly reported issues in all available latest reports.
 */
 
 // IMPORTS
 
 const {sendAlert} = require('../../alerts');
 const {
+  getEngineNamesString,
   getLatestReportExtracts,
   getReport,
-  getToolNamesString,
   getWCAGLink,
   getWeightName,
   objectSort,
@@ -78,7 +78,7 @@ const getIssuesSummary = async () => {
         weight: issueSpecs[issueID].weight,
         count,
         percentage: 0,
-        reporters: getToolNamesString(reporters)
+        reporters: getEngineNamesString(reporters)
       });
     }
     // Otherwise, i.e. if it is no longer classified:
@@ -143,7 +143,7 @@ const populateQuery = async query => {
         lines.push(`${margin}    <ul class="nav">`);
         const linkText = 'What rules belong to this issue?';
         const label = `What rules belong to the <q>${summary}</q> issue?`;
-        const href = `/rules.html/${issueID}`;
+        const href = `/listRules.html/${issueID}`;
         lines.push(
           `${margin}      <li><a href="${href}" aria-label="${label}">${linkText}</a></li>`
         );

package/web/{reportIssue → listViolators}/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Answers the reportIssue question.
+  Lists the violators of an issue in a report.
 */
 
 // IMPORTS
@@ -9,7 +9,7 @@ const {
   getPageDataStrings,
   getPathID,
   getReport,
-  getToolNamesString,
+  getEngineNamesString,
   getTextFragmentHref,
   getWCAGLink,
   getWeightName,
@@ -92,7 +92,7 @@ const populateQuery = async (issueID, timeStamp, jobID, query) => {
         text: catalog[catalogIndex]?.text ?? '',
         reporters: new Set()
       };
-      // Ensure that the tool is in the sets of reporters of the violator and the issue.
+      // Ensure that the rule engine is in the sets of reporters of the violator and the issue.
       violators[catalogIndex].reporters.add(which);
       query.reporters.add(which);
     });
@@ -103,12 +103,12 @@ const populateQuery = async (issueID, timeStamp, jobID, query) => {
   // For each violator:
   Object.values(violators).forEach(violatorData => {
     // Convert the set of its reporters to a string.
-    violatorData.reporters = getToolNamesString(violatorData.reporters);
+    violatorData.reporters = getEngineNamesString(violatorData.reporters);
   });
   const reporterCount = query.reporters.size;
   query.reporterCount = reporterCount === 1 ? '1 rule engine' : `${reporterCount} rule engines`;
   // Convert the set of issue reporters to a string.
-  query.reporters = getToolNamesString(query.reporters);
+  query.reporters = getEngineNamesString(query.reporters);
   // Convert the violator data to an array.
   violators = Object.entries(violators).map(entry => ({
     catalogIndex: entry[0],
@@ -151,7 +151,7 @@ const populateQuery = async (issueID, timeStamp, jobID, query) => {
       }
     }
     const href
-    = `/diagnoses.html/${issueID}/${timeStamp}/${jobID}/${catalogIndex}?pathID=${pathID}`;
+    = `/listDiagnoses.html/${issueID}/${timeStamp}/${jobID}/${catalogIndex}?pathID=${pathID}`;
     const questionString = 'What diagnoses were reported';
     const labelString = `${questionString} for violator ${index + 1}?`;
     lines.push(

package/web/manage/index.html

@@ -15,17 +15,17 @@
       <h1><a href="/">Kilotest</a> management</h1>
       <p>Kilotest managers can:</p>
       <ul class="nav">
-        <li><a href="/recActionForm.html">Approve or reject a test recommendation</a></li>
+        <li><a href="/enqueueForm.html">Approve or reject a test recommendation</a></li>
         <li><a href="/reannotateForm.html">
           Reannotate reports to incorporate newly classified and reclassified rules
         </a></li>
-        <li><a href="/reportsPruneForm.html">Delete superseded reports</a></li>
-        <li><a href="/reportsRewindForm.html">Delete latest superseding reports</a></li>
-        <li><a href="/reportsExpungeForm.html">Delete sole reports</a></li>
-        <li><a href="/reportHideForm.html">Classify a report as experimental</a></li>
-        <li><a href="/reportUnhideForm.html">Declassify a report as experimental</a></li>
+        <li><a href="/pruneReportsForm.html">Delete superseded reports</a></li>
+        <li><a href="/rewindReportsForm.html">Delete latest superseding reports</a></li>
+        <li><a href="/expungeReportsForm.html">Delete sole reports</a></li>
+        <li><a href="/hideReportForm.html">Classify a report as experimental</a></li>
+        <li><a href="/unhideReportForm.html">Declassify a report as experimental</a></li>
         <li><a href="/ai0BalanceForm.html">Record the current balance of AI service 0</a></li>
-        <li><a href="/wcagRenewForm.html">Renew the map of WCAG numeric to text identifiers</a></li>
+        <li><a href="/renewWCAGForm.html">Renew the map of WCAG numeric to text identifiers</a></li>
       </ul>
     </main>
   </body>

package/web/manage/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Answers the managers question.
+  Lists the actions that managers can take.
 */
 
 // IMPORTS

package/web/{reportsPruneForm → pruneReportsForm}/index.html

@@ -14,7 +14,7 @@
     <main>
       <h1><a href="/">Kilotest</a>: Prune reports</h1>
       <p>__intro__</p>
-      <form action="/reportsPruneForm.html">
+      <form action="/pruneReportsForm.html">
         <fieldset>
           <legend>Reports</legend>
           __reports__

package/web/{reportsPruneForm → pruneReportsForm}/index.js

@@ -55,7 +55,7 @@ exports.answer = async (_, search) => {
     const [timeStamp, jobID] = reportName.slice(0, -5).split('-');
     // Get a summary of it.
     const reportFacts = await getReportData(timeStamp, jobID);
-    const {error, issueCount, preventedToolCount, url} = reportFacts;
+    const {error, issueCount, preventedEngineCount, url} = reportFacts;
     // If this failed:
     if (error) {
       // Return why.
@@ -69,7 +69,7 @@ exports.answer = async (_, search) => {
       timeStamp,
       jobID,
       issueCount,
-      preventedToolCount,
+      preventedEngineCount,
       url
     });
   }
@@ -85,9 +85,9 @@ exports.answer = async (_, search) => {
   let anyDeletable = false;
   // For each summary:
   reportSpecs.forEach((spec, index) => {
-    const {timeStamp, jobID, issueCount, preventedToolCount, url} = spec;
+    const {timeStamp, jobID, issueCount, preventedEngineCount, url} = spec;
     const jobName = `${timeStamp}-${jobID}`;
-    const specString = `<code>${url}</code> (<code>${jobName}</code>): preventions ${preventedToolCount}, issues ${issueCount}`;
+    const specString = `<code>${url}</code> (<code>${jobName}</code>): preventions ${preventedEngineCount}, issues ${issueCount}`;
     // If its report is a non-latest report:
     if (reportSpecs[index + 1]?.url === url) {
       // Add a line with a deletion checkbox.

package/web/reannotate/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Implements a reannotation order, i.e. an order to update the issue IDs of the standard instances of the latest reports on all tested targets.
+  Reannotates all available latest reports.
 */
 
 // IMPORTS

package/web/reannotateForm/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Discloses unclassified and reclassified rules and serves a form to reannotate reports.
+  Serves a form to reannotate reports.
 */
 
 // IMPORTS
@@ -62,27 +62,27 @@ const populateQuery = async query => {
   const stillUnclassifiedLines = [];
   const reClassifiedLines = [];
   const margin = ' '.repeat(6);
-  // For each tool reporting any violations of still unclassified rules:
-  Object.keys(stillUnclassified).forEach(toolID => {
+  // For each rule engine reporting any violations of still unclassified rules:
+  Object.keys(stillUnclassified).forEach(engineID => {
     // For each such rule:
-    Object.keys(stillUnclassified[toolID]).forEach(ruleID => {
-      const reportIDs = Array.from(stillUnclassified[toolID][ruleID]);
+    Object.keys(stillUnclassified[engineID]).forEach(ruleID => {
+      const reportIDs = Array.from(stillUnclassified[engineID][ruleID]);
       // Add a line to the lines on the rule.
       stillUnclassifiedLines.push(
-        `${margin}<li>${toolID}: ${ruleID} (${reportIDs.join(', ')})</li>`
+        `${margin}<li>${engineID}: ${ruleID} (${reportIDs.join(', ')})</li>`
       );
     });
   });
   // Add the lines to the query.
   query.stillUnclassified = stillUnclassifiedLines.join('\n');
-  // For each tool reporting any discrepancies in rule classification:
-  Object.keys(reClassified).forEach(toolID => {
+  // For each rule engine reporting any discrepancies in rule classification:
+  Object.keys(reClassified).forEach(engineID => {
     // For each such rule:
-    Object.keys(reClassified[toolID]).forEach(ruleID => {
-      const reportIDs = Array.from(reClassified[toolID][ruleID]);
+    Object.keys(reClassified[engineID]).forEach(ruleID => {
+      const reportIDs = Array.from(reClassified[engineID][ruleID]);
       // Add a line to the lines on the rule.
       reClassifiedLines.push(
-        `${margin}<li>${toolID}: ${ruleID} (${reportIDs.join(', ')})</li>`
+        `${margin}<li>${engineID}: ${ruleID} (${reportIDs.join(', ')})</li>`
       );
     });
   });

package/web/{wcagRenew → renewWCAG}/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Renews the WCAG map and serves an acknowledgment.
+  Renews the WCAG map.
 */
 
 // IMPORTS

package/web/{wcagRenewForm → renewWCAGForm}/index.html

@@ -14,7 +14,7 @@
     <main>
       <h1><a href="/">Kilotest</a>: Renew WCAG map</h1>
       <p>Submit this form to renew the map of WCAG numeric to text identifiers.</p>
-      <form action="/wcagRenew.html" method="post">
+      <form action="/renewWCAG.html" method="post">
         <p><label>
           Authorization code: <input size="3" minLength="3" maxlength="3" name="authCode" required>
         </label></p>

package/web/{retestRec → requestRetest}/index.html

@@ -16,7 +16,7 @@
       <p>Your recommendation to retest the __target__ page has been received.</p>
       <p>The reason for your recommendation has been recorded as <q>__why__</q>.</p>
       <p>Thank you for your recommendation.</p>
-      <p>If a <a href="/recActionForm.html">Kilotest manager approves this recommendation</a>, a test order will be added to the queue.</p>
+      <p>If a <a href="/enqueueForm.html">Kilotest manager approves this recommendation</a>, a test order will be added to the queue.</p>
       <p>In most cases, if you check Kilotest again in 1 day, you will find that the recommended test has been performed.</p>
     </main>
   </body>

package/web/{retestRec → requestRetest}/index.js

@@ -1,15 +1,14 @@
 /*
   index.js
-  Answers the retest question.
+  Records a retest request.
 */
 
 // IMPORTS
 
-const {getLatestReportExtracts, processRec} = require('../../util');
+const {getLatestReportExtracts, processTestRequest} = require('../../util');
 
 // FUNCTIONS
 
-// Records a retest recommendation and returns an acknowledgement page.
 exports.answer = async (pageArgs, why) => {
   const [timeStamp, jobID] = pageArgs.split('/');
   // Get data on the latest available reports.
@@ -27,6 +26,6 @@ exports.answer = async (pageArgs, why) => {
       message: error
     };
   }
-  // Otherwise, i.e. if it succeeded, process the recommendation.
-  return await processRec('retest', __dirname, what, url, why);
+  // Otherwise, i.e. if it succeeded, process the request.
+  return await processTestRequest('retest', __dirname, what, url, why);
 };

package/web/{retestRecForm → requestRetestForm}/index.html

@@ -13,9 +13,9 @@
   <body>
     <main>
       <h1><a href="/">Kilotest</a>: Retest recommendation for __target__</h1>
-      <p>The __target__ page was <a href="/reportIssues.html/__timeStamp__/__jobID__">last tested</a> __ago__ ago by job <code>__jobID__</code> on __dateTime__.</p>
+      <p>The __target__ page was <a href="/listIssues.html/__timeStamp__/__jobID__">last tested</a> __ago__ ago by job <code>__jobID__</code> on __dateTime__.</p>
       <p>To recommend a retest, submit the following form.</p>
-      <form action="/retestRec.html/__timeStamp__/__jobID__" method="post">
+      <form action="/requestRetest.html/__timeStamp__/__jobID__" method="post">
         <p><label>
           Why retest the page (answer required)?<br>
           <input size="70" minlength="5" maxlength="100" name="why" required>

package/web/{retestRecForm → requestRetestForm}/index.js

@@ -1,6 +1,6 @@
 /*
   index.js
-  Answers the retest question.
+  Serves a form for requesting a retest.
 */
 
 // IMPORTS

package/web/{testRec → requestTest}/index.html

@@ -16,7 +16,7 @@
       <p>Your recommendation to test the __target__ page has been received.</p>
       <p>The reason for your recommendation has been recorded as <q>__why__</q>.</p>
       <p>Thank you for your recommendation.</p>
-      <p>If a <a href="/recActionForm.html">Kilotest manager approves this recommendation</a>, a test order will be added to the queue.</p>
+      <p>If a <a href="/enqueueForm.html">Kilotest manager approves this recommendation</a>, a test order will be added to the queue.</p>
       <p>In most cases, if you check Kilotest again in 1 day, you will find that the recommended job has been performed.</p>
     </main>
   </body>

package/web/{testRec → requestTest}/index.js

@@ -1,18 +1,17 @@
 /*
   index.js
-  Processes a test recommendation.
+  Records a test request.
 */
 
 // IMPORTS
 
-const {isRecommendable, processRec} = require('../../util');
+const {isRecommendable, processTestRequest} = require('../../util');
 
 // FUNCTIONS
 
-// Records a test recommendation and returns an acknowledgement page.
 exports.answer = async (what, url, why) => {
   const status = await isRecommendable(url);
-  // If the target is already claimed or queued and is thus not recommendable:
+  // If the target is already claimed or queued and is thus not requestable:
   if (status) {
     // Return an answer reporting this.
     return {
@@ -20,6 +19,6 @@ exports.answer = async (what, url, why) => {
       message: `Page is already ${status}`
     };
   }
-  // Otherwise, i.e. if it is recommendable, process the recommendation.
-  return await processRec('test', __dirname, what, url, why);
+  // Otherwise, i.e. if it is requestable, process the request.
+  return await processTestRequest('test', __dirname, what, url, why);
 };

package/web/{testRecForm → requestTestForm}/index.html

@@ -14,7 +14,7 @@
     <main>
       <h1><a href="/">Kilotest</a>: Test recommendation</h1>
       <p>You may recommend a web page for testing by submitting the following form. All answers are required.</p>
-      <form action="/testRec.html" method="post">
+      <form action="/requestTest.html" method="post">
         <p><label>
           Propose a name for the page.<br>
           <input size="50" maxlength="70" name="what" required>