fix tests

flakey5 · flakey5 · commit 019f2cf790ad · 2024-12-22T12:03:30.000-08:00
Signed-off-by: flakey5 &lt;73616808+flakey5@users.noreply.github.com&gt;
diff --git a/scripts/build-r2-symlinks.mjs b/scripts/build-r2-symlinks.mjs
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env node
 'use strict';
 
 import { join } from 'node:path';
diff --git a/src/middleware/subtituteMiddleware.ts b/src/middleware/subtituteMiddleware.ts
@@ -39,6 +39,6 @@ export class SubtitutionMiddleware implements Middleware {
       new Request(request)
     );
 
-    return this.router.handle(substitutedRequest, ctx);
+    return this.router.handle(substitutedRequest, ctx, request.urlObj);
   }
 }
diff --git a/src/providers/r2Provider.ts b/src/providers/r2Provider.ts
@@ -87,7 +87,8 @@ export class R2Provider implements Provider {
     options?: ReadDirectoryOptions
   ): Promise<ReadDirectoryResult | undefined> {
     if (path in CACHED_DIRECTORIES) {
-      // @ts-expect-error
+      // @ts-expect-error dates may not be parsed at this point, we take care
+      //  of it below
       const result: ReadDirectoryResult = CACHED_DIRECTORIES[path];
 
       for (const file of result.files) {
diff --git a/tests/e2e/directory.test.ts b/tests/e2e/directory.test.ts
@@ -1,6 +1,6 @@
 import { after, before, describe, it } from 'node:test';
 import assert from 'node:assert';
-import { readFileSync, writeFileSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import http from 'http';
 import { Miniflare } from 'miniflare';
@@ -24,9 +24,12 @@ async function startS3Mock(): Promise<http.Server> {
     const r2Prefix = url.searchParams.get('prefix')!;
 
     let doesFolderExist =
-      ['nodejs/release/', 'nodejs/', 'nodejs/docs/', 'metrics/'].includes(
-        r2Prefix
-      ) || r2Prefix.endsWith('/docs/api/');
+      [
+        'nodejs/release/v1.0.0/',
+        'nodejs/',
+        'nodejs/docs/',
+        'metrics/',
+      ].includes(r2Prefix) || r2Prefix.endsWith('/docs/api/');
 
     if (doesFolderExist) {
       xmlFilePath += 'ListObjectsV2-exists.xml';
@@ -76,15 +79,27 @@ describe('Directory Tests (Restricted Directory Listing)', () => {
   });
 
   it('redirects `/dist` to `/dist/` and returns expected html', async () => {
-    const [originalRes, expectedHtml] = await Promise.all([
-      mf.dispatchFetch(`${url}dist`, { redirect: 'manual' }),
+    const originalRes = await mf.dispatchFetch(`${url}dist`, {
+      redirect: 'manual',
+    });
+
+    assert.strictEqual(originalRes.status, 301);
+    const res = await mf.dispatchFetch(originalRes.headers.get('location')!);
+    assert.strictEqual(res.status, 200);
+    assert.strictEqual(
+      res.headers.get('cache-control'),
+      'public, max-age=3600, s-maxage=14400'
+    );
+  });
+
+  it('`/dist/v1.0.0/` returns expected html', async () => {
+    const [res, expectedHtml] = await Promise.all([
+      mf.dispatchFetch(`${url}dist/v1.0.0/`),
       readFile('./tests/e2e/test-data/expected-html/dist.txt', {
         encoding: 'utf-8',
       }),
     ]);
 
-    assert.strictEqual(originalRes.status, 301);
-    const res = await mf.dispatchFetch(originalRes.headers.get('location')!);
     assert.strictEqual(res.status, 200);
     assert.strictEqual(
       res.headers.get('cache-control'),
diff --git a/tests/e2e/test-data/expected-html/dist.txt b/tests/e2e/test-data/expected-html/dist.txt
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html>
 <head>
-  <title>Index of /dist/</title>
+  <title>Index of /dist/v1.0.0/</title>
   <style>   
     @media (prefers-color-scheme: dark) {
       body {
@@ -17,8 +17,8 @@
   </style>
 </head>
 <body>
-<h1>Index of /dist/</h1><hr><pre><a href="../">../</a>
+<h1>Index of /dist/v1.0.0/</h1><hr><pre><a href="../">../</a>
 <a href="latest/">latest/</a>                                                           -                   -
-<a href="/dist/index.json">index.json</a>                                         12 Sept 2023, 05:43                 18 B
+<a href="/dist/v1.0.0/index.json">index.json</a>                                         12 Sept 2023, 05:43                 18 B
 </pre><hr /></body>
 </html>
diff --git a/tests/e2e/test-data/expected-s3/ListObjectsV2-exists.xml b/tests/e2e/test-data/expected-s3/ListObjectsV2-exists.xml
@@ -5,11 +5,11 @@
   <MaxKeys>1000</MaxKeys>
   <IsTruncated>false</IsTruncated>
   <CommonPrefixes>
-    <Prefix>nodejs/release/latest/</Prefix>
+    <Prefix>nodejs/release/v1.0.0/latest/</Prefix>
   </CommonPrefixes>
   <Contents>
     <ETag>"asd123"</ETag>
-    <Key>nodejs/release/index.json</Key>
+    <Key>nodejs/release/v1.0.0/index.json</Key>
     <LastModified>2023-09-12T05:43:00.000Z</LastModified>
     <Size>18</Size>
   </Contents>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env bash`
	`1`	`+#!/usr/bin/env node`
`2`	`2`	`'use strict';`
`3`	`3`
`4`	`4`	`import { join } from 'node:path';`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ export class SubtitutionMiddleware implements Middleware {`
`39`	`39`	`new Request(request)`
`40`	`40`	`);`
`41`	`41`
`42`		`- return this.router.handle(substitutedRequest, ctx);`
	`42`	`+ return this.router.handle(substitutedRequest, ctx, request.urlObj);`
`43`	`43`	`}`
`44`	`44`	`}`