@jrpool/kilotest 59.1.3 → 60.0.0

package/web/requestRetest/index.ts

@@ -10,9 +10,9 @@ import {populateTemplate, processTestRequest} from '../../util.ts';
 // FUNCTIONS
 
 export const answer = async (pageArgs: string, reason: string) => {
-  const [timeStamp, jobID] = pageArgs.split('/') as [string, string];
+  const reportID = pageArgs;
   // Process the request. This resolves the cited report's description and URL itself.
-  const processResult = await processTestRequest(reason, {timeStamp, jobID});
+  const processResult = await processTestRequest(reason, {reportID});
   // If the cited report does not exist:
   if (processResult.result === 'nonreport') {
     // Report this.

package/web/requestRetest/requestRetest.test.ts

@@ -65,7 +65,7 @@ test('answer returns ok with a populated answer page for a valid retest request'
   // Require the module after DB_DIR is set.
   const {answer} = await import('./index.ts');
   // Use the 260101T0001-ct report (All CantTell Page, https://example.com/canttell).
-  const result: any = await answer('260101T0001/ct', 'Because changes were made');
+  const result: any = await answer('260101T0001-ct', 'Because changes were made');
   assert.equal(result.status, 'ok');
   assert.ok(result.answerPage, 'answerPage should be present');
   // Verify the description and reason placeholders were replaced with the report target.
@@ -86,7 +86,7 @@ test('answer returns ok with a populated answer page for a valid retest request'
 test('answer returns an error when the report does not exist', async () => {
   const {answer} = await import('./index.ts');
   // Use a nonexistent report timestamp and jobID.
-  const result: any = await answer('990101T0000/xxx', 'Because changes were made');
+  const result: any = await answer('990101T0000-xxx', 'Because changes were made');
   assert.equal(result.status, 'error');
   assert.equal(result.message, 'Invalid request');
 });
@@ -94,8 +94,8 @@ test('answer returns an error when the report does not exist', async () => {
 test('answer returns an error for a duplicate retest request', async () => {
   const {answer} = await import('./index.ts');
   // Submit the same retest request twice; the second is a duplicate.
-  await answer('260101T0001/ct', 'Because changes were made');
-  const result: any = await answer('260101T0001/ct', 'Because changes were made');
+  await answer('260101T0001-ct', 'Because changes were made');
+  const result: any = await answer('260101T0001-ct', 'Because changes were made');
   assert.equal(result.status, 'error');
   assert.equal(result.message, 'Test request duplicates an already submitted request');
 });
@@ -103,7 +103,7 @@ test('answer returns an error for a duplicate retest request', async () => {
 test('answer returns an error when the cited report has been superseded', async () => {
   const {answer} = await import('./index.ts');
   // 260101T0000-mix (Mixed Outcomes) is superseded by 260202T0000-new.
-  const result: any = await answer('260101T0000/mix', 'Because changes were made');
+  const result: any = await answer('260101T0000-mix', 'Because changes were made');
   assert.equal(result.status, 'error');
   assert.equal(result.message, 'A later report about the page is already available');
 });
@@ -119,7 +119,7 @@ test('answer returns an error when a matching job is already claimed or queued',
     target: {what: 'All CantTell Page', url: 'https://example.com/unrelated'}
   }));
   try {
-    const result: any = await answer('260101T0001/ct', 'Because changes were made');
+    const result: any = await answer('260101T0001-ct', 'Because changes were made');
     assert.equal(result.status, 'error');
     assert.equal(result.message, 'A request to test a page with the same description or URL is already approved');
   }
@@ -135,7 +135,7 @@ test('answer returns an error with a fallback channel when the request queue is
     timeStamp: '260101T0000', description: `Filler Page ${i}`, reason: 'Because filler'
   }));
   await fs.writeFile(testRequestsPath, JSON.stringify({'https://example.com/filler': filler}));
-  const result: any = await answer('260101T0001/ct', 'Because changes were made');
+  const result: any = await answer('260101T0001-ct', 'Because changes were made');
   assert.equal(result.status, 'error');
   assert.ok(result.message.startsWith('Too many requests are awaiting approval right now.'));
   assert.ok(result.message.includes('https://github.com/jrpool/kilotest/issues'));

package/web/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="/listIssues.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/__reportID__">last tested</a> __ago__ ago by job <code>__reportID__</code> on __dateTime__.</p>
       <p>To recommend a retest, submit the following form.</p>
-      <form action="/requestRetest.html/__timeStamp__/__jobID__" method="post">
+      <form action="/requestRetest.html/__reportID__" method="post">
         <p><label>
           Why retest the page (answer required)?<br>
           <input size="70" minlength="5" maxlength="100" name="why" required>

package/web/requestRetestForm/index.ts

@@ -12,12 +12,12 @@ import {getAgoString, getDateTimeString} from '../util.ts';
 
 // Returns a retest recommendation form.
 export const answer = async (pageArgs: string) => {
-  const [timeStamp, jobID] = pageArgs.split('/') as [string, string];
+  const reportID = pageArgs;
   // Get data on the latest available reports.
   const reportExtracts = await getReportExtracts(true);
   // Get data on the report whose page is to be retested.
   const reportExtract = reportExtracts.find(
-    (reportExtract: any) => reportExtract.timeStamp === timeStamp && reportExtract.jobID === jobID
+    (reportExtract: any) => reportExtract.id === reportID
   );
   // Initialize the page description.
   let target: string;
@@ -35,8 +35,7 @@ export const answer = async (pageArgs: string) => {
   const reportTime = new Date(reportExtract?.reportTime ?? NaN);
   const query: Record<string, string> = {
     target,
-    timeStamp,
-    jobID,
+    reportID,
     ago: getAgoString(reportTime),
     dateTime: getDateTimeString(reportTime)
   };

package/web/requestRetestForm/requestRetestForm.test.ts

@@ -30,7 +30,7 @@ after(() => {
 // TESTS
 
 test('requestRetestForm returns ok with the page name for a valid report', async () => {
-  const result = await answer('260202T0000/new');
+  const result = await answer('260202T0000-new');
   assert.equal(result.status, 'ok');
   assert.ok(result.answerPage);
   const html = parse(result.answerPage);
@@ -38,11 +38,11 @@ test('requestRetestForm returns ok with the page name for a valid report', async
   assert.ok(title?.includes('Mixed Outcomes'));
 });
 
-test('requestRetestForm populates the form action with the timeStamp and jobID', async () => {
-  const result = await answer('260202T0000/new');
+test('requestRetestForm populates the form action with the reportID', async () => {
+  const result = await answer('260202T0000-new');
   const html = parse(result.answerPage);
   const form = html.querySelector('form');
-  assert.equal(form?.getAttribute('action'), '/requestRetest.html/260202T0000/new');
+  assert.equal(form?.getAttribute('action'), '/requestRetest.html/260202T0000-new');
 });
 
 test('requestRetestForm shows the fallback message for a nonexistent report', async () => {
@@ -52,7 +52,7 @@ test('requestRetestForm shows the fallback message for a nonexistent report', as
 });
 
 test('requestRetestForm dates the report by its completion time', async () => {
-  const result = await answer('260202T0000/new');
+  const result = await answer('260202T0000-new');
   assert.ok(result.answerPage.includes('on 2026-02-02 at 00:10'));
 });
 
@@ -63,10 +63,9 @@ test('requestRetestForm describes the time of a nonexistent report as unknown',
 });
 
 test('requestRetestForm includes the ago and dateTime placeholders replaced', async () => {
-  const result = await answer('260202T0000/new');
+  const result = await answer('260202T0000-new');
   assert.ok(!result.answerPage.includes('__ago__'));
   assert.ok(!result.answerPage.includes('__dateTime__'));
   assert.ok(!result.answerPage.includes('__target__'));
-  assert.ok(!result.answerPage.includes('__timeStamp__'));
-  assert.ok(!result.answerPage.includes('__jobID__'));
+  assert.ok(!result.answerPage.includes('__reportID__'));
 });

package/web/unhideReportForm/index.ts

@@ -59,13 +59,11 @@ export const answer = async (_: any, search: string, method: string) => {
     // Get the report.
     const report = JSON.parse(reportJSON);
     const {id, target} = report;
-    const [timeStamp, jobID] = id.split('-');
     const {what: description} = target;
     // Add its data to the array.
     reportsData.push({
       description,
-      timeStamp,
-      jobID,
+      id,
       reportTime: getReportEndTime(report)
     });
   }
@@ -80,12 +78,12 @@ export const answer = async (_: any, search: string, method: string) => {
   const margin = ' '.repeat(12);
   // For each report:
   reportsData.forEach(data => {
-    const {jobID, timeStamp, description, reportTime} = data;
+    const {id, description, reportTime} = data;
     const when = getDateTimeString(reportTime);
-    const specString = `${description} (job <code>${timeStamp}-${jobID}</code> completed ${when})`;
+    const specString = `${description} (job <code>${id}</code> completed ${when})`;
     // Add a line with a radio button to unhide it.
     lines.push(
-      `${margin}<p><input type="radio" name="report" value="${timeStamp}-${jobID}"> ${specString}</p>`
+      `${margin}<p><input type="radio" name="report" value="${id}"> ${specString}</p>`
     );
   });
   const query: Record<string, string> = {

package/web/util.test.ts

@@ -119,8 +119,8 @@ test('makeBreakable inserts wbr before non-initial slashes', () => {
 });
 
 // Returns a fixture report, failing the test if it is not usable.
-const getFixtureReport = async (timeStamp: string, jobID: string) => {
-  const report = await getReport(timeStamp, jobID);
+const getFixtureReport = async (reportID: string) => {
+  const report = await getReport(reportID);
   if (isReportError(report)) {
     assert.fail(report.error);
   }
@@ -128,19 +128,19 @@ const getFixtureReport = async (timeStamp: string, jobID: string) => {
 };
 
 test('getPageData returns page data for a valid report', async () => {
-  const data = getPageData(await getFixtureReport('260101T0000', 'mix'));
+  const data = getPageData(await getFixtureReport('260101T0000-mix'));
   assert.equal(data.description, 'Mixed Outcomes');
   assert.equal(data.url, 'https://example.com/mixed');
   assert.equal(typeof data.daysAgo, 'number');
 });
 
 test('getReport returns an error for a nonexistent report', async () => {
-  const report = await getReport('999999T9999', 'xxx');
+  const report = await getReport('999999T9999-xxx');
   assert.ok(isReportError(report));
 });
 
 test('getPageDataStrings returns HTML strings for a valid report', async () => {
-  const strings = getPageDataStrings(await getFixtureReport('260101T0000', 'mix'));
+  const strings = getPageDataStrings(await getFixtureReport('260101T0000-mix'));
   assert.equal(strings.description, 'Mixed Outcomes');
   assert.equal(strings.url, 'https://example.com/mixed');
   assert.equal(strings.urlLink, '<a href="https://example.com/mixed">https://example.com/mixed</a>');
@@ -149,7 +149,7 @@ test('getPageDataStrings returns HTML strings for a valid report', async () => {
 });
 
 test('getPageDataStrings dates a report by its completion time, not by its job time stamp', async () => {
-  const report = await getFixtureReport('260101T0001', 'ct');
+  const report = await getFixtureReport('260101T0001-ct');
   report.jobData.endTime = '26-03-04T05:06';
   const strings = getPageDataStrings(report);
   assert.equal(strings.description, 'All CantTell Page');
@@ -167,7 +167,7 @@ test('getDateTimeString describes an invalid date as unknown', () => {
 });
 
 test('getPageDataStrings derives the strings from the report object', async () => {
-  const report = await getFixtureReport('260101T0000', 'mix');
+  const report = await getFixtureReport('260101T0000-mix');
   report.target.what = 'Custom Page';
   const strings = getPageDataStrings(report);
   assert.equal(strings.description, 'Custom Page');
@@ -188,7 +188,7 @@ test('getPageDataStrings reports a 1-day-old report as tested 1 day ago', () =>
 
 test('getReportData returns data for a valid report', async () => {
   const {getReportData} = await import('./util.ts');
-  const result = getReportData(await getFixtureReport('260101T0000', 'mix'));
+  const result = getReportData(await getFixtureReport('260101T0000-mix'));
   assert.equal(result.url, 'https://example.com/mixed');
   assert.equal(result.jobName, '260101T0000-mix');
 });
@@ -201,7 +201,7 @@ test('getReportData falls back to the engine ID for an unknown prevented engine'
   const reportPath = path.join(reportsPath(), '260103T0000-unk.json');
   await fs.writeFile(reportPath, JSON.stringify(reportJSON));
   try {
-    const result = getReportData(await getFixtureReport('260103T0000', 'unk'));
+    const result = getReportData(await getFixtureReport('260103T0000-unk'));
     assert.ok(result.preventedEngineNames.includes('unknownEngine'));
   }
   finally {
@@ -211,7 +211,7 @@ test('getReportData falls back to the engine ID for an unknown prevented engine'
 
 test('getPageFactsLines returns the about-page list lines for a report', async () => {
   const {getReportData} = await import('./util.ts');
-  const report = await getFixtureReport('260101T0000', 'mix');
+  const report = await getFixtureReport('260101T0000-mix');
   const lines = getPageFactsLines(getPageDataStrings(report), getReportData(report), '  ');
   const html = lines.join('\n');
   assert.ok(html.includes('<li>URL: <a href="https://example.com/mixed">'));
@@ -223,19 +223,19 @@ test('getPageFactsLines returns the about-page list lines for a report', async (
 
 test('getPageFactsLines ends with a link to download the full report', async () => {
   const {getReportData} = await import('./util.ts');
-  const report = await getFixtureReport('260101T0000', 'mix');
+  const report = await getFixtureReport('260101T0000-mix');
   const lines = getPageFactsLines(getPageDataStrings(report), getReportData(report), '');
   const topItems = parse(lines.join('\n')).querySelectorAll('ul:not(ul ul) > li');
   const lastItem = topItems[topItems.length - 1]!;
   assert.ok(topItems[topItems.length - 2]!.text.trim().startsWith('Summary of results:'));
-  assert.equal(lastItem.querySelector('a')?.getAttribute('href'), '/fullReport.json/260101T0000/mix');
+  assert.equal(lastItem.querySelector('a')?.getAttribute('href'), '/fullReport.json/260101T0000-mix');
   assert.equal(lastItem.text.trim(), 'Download the full technical report (JSON)');
 });
 
 // Returns the 3 rule-engine amounts and the 3 summary amounts of the page facts of a report.
-const getResultFacts = async (timeStamp: string, jobID: string) => {
+const getResultFacts = async (reportID: string) => {
   const {getReportData} = await import('./util.ts');
-  const report = await getFixtureReport(timeStamp, jobID);
+  const report = await getFixtureReport(reportID);
   const lines = getPageFactsLines(getPageDataStrings(report), getReportData(report), '');
   const items = parse(lines.join('\n')).querySelectorAll('li');
   const itemTexts: string[] = items.map(li => li.text.trim());
@@ -263,21 +263,21 @@ const getResultFacts = async (timeStamp: string, jobID: string) => {
 };
 
 // Expected facts, hand-computed from the fixtures.
-const expectedFacts: [string, string, number, number, number, number, number, number][] = [
-  // Time stamp, job ID, engines called, engines able to test, reporting engines, violations, violators, issues.
-  ['260101T0000', 'mix', 2, 2, 2, 3, 2, 2],
-  ['260202T0000', 'new', 1, 1, 1, 1, 1, 1],
-  ['260101T0001', 'ct', 1, 1, 0, 0, 0, 0],
-  ['260101T0002', 'no', 1, 1, 1, 1, 1, 1],
-  ['260101T0005', 'emp', 1, 1, 0, 0, 0, 0],
-  ['260101T0006', 'prv', 2, 1, 1, 1, 1, 1],
-  ['260101T0008', 'mul', 2, 2, 2, 4, 3, 1],
-  ['260101T0009', 'brd', 3, 3, 1, 4, 4, 1]
+const expectedFacts: [string, number, number, number, number, number, number][] = [
+  // Report ID, engines called, engines able to test, reporting engines, violations, violators, issues.
+  ['260101T0000-mix', 2, 2, 2, 3, 2, 2],
+  ['260202T0000-new', 1, 1, 1, 1, 1, 1],
+  ['260101T0001-ct', 1, 1, 0, 0, 0, 0],
+  ['260101T0002-no', 1, 1, 1, 1, 1, 1],
+  ['260101T0005-emp', 1, 1, 0, 0, 0, 0],
+  ['260101T0006-prv', 2, 1, 1, 1, 1, 1],
+  ['260101T0008-mul', 2, 2, 2, 4, 3, 1],
+  ['260101T0009-brd', 3, 3, 1, 4, 4, 1]
 ];
 
-for (const [timeStamp, jobID, called, tested, reporters, violations, violators, issues] of expectedFacts) {
-  test(`getPageFactsLines gives correct rule-engine and summary amounts for ${timeStamp}-${jobID}`, async () => {
-    const facts = await getResultFacts(timeStamp, jobID);
+for (const [reportID, called, tested, reporters, violations, violators, issues] of expectedFacts) {
+  test(`getPageFactsLines gives correct rule-engine and summary amounts for ${reportID}`, async () => {
+    const facts = await getResultFacts(reportID);
     assert.equal(facts.called, called);
     assert.equal(facts.tested, tested);
     assert.equal(facts.reporters, reporters);
@@ -290,7 +290,7 @@ for (const [timeStamp, jobID, called, tested, reporters, violations, violators,
 
 test('getIssueFactsLines returns the about-issue list lines for a report', async () => {
   const {getIssueFactsLines} = await import('./util.ts');
-  const report = await getFixtureReport('260101T0000', 'mix');
+  const report = await getFixtureReport('260101T0000-mix');
   const lines = getIssueFactsLines(report, 'linkNoText', '  ');
   const html = lines.join('\n');
   assert.ok(html.includes('<li>Why it matters:'));
@@ -303,7 +303,7 @@ test('getIssueFactsLines returns the about-issue list lines for a report', async
 
 test('getViolatorFactsLines returns the about-violator list lines for a report', async () => {
   const {getViolatorFactsLines} = await import('./util.ts');
-  const report = await getFixtureReport('260101T0000', 'mix');
+  const report = await getFixtureReport('260101T0000-mix');
   const lines = getViolatorFactsLines(report, 'linkNoText', '0', null, '  ');
   const html = lines.join('\n');
   assert.ok(html.includes('<li>Tag name: <code>'));

package/web/util.ts

@@ -271,7 +271,7 @@ export const getPageDataStrings = (report: UsableReport): PageDataStrings => {
     url,
     urlLink: `<a href="${url}">${url}</a>`,
     testInfo: `Tested ${daysAgo === 1 ? '1 day' : `${daysAgo} days`} ago on ${when} by job <code>${report.id}</code>`,
-    fullReportLink: `<a href="/fullReport.json/${report.id.replace('-', '/')}">Download the full technical report</a> (JSON)`
+    fullReportLink: `<a href="/fullReport.json/${report.id}">Download the full technical report</a> (JSON)`
   };
 };
 // Returns the lines of a list of facts about the page of an available report.