✅🤖 address follow-up review comments on grapher r2 e2e tests

- simplify test worker context by always injecting a test ASSETS stub
- add a test-only r2-has-key endpoint for assertions
- strengthen fallback test to assert key is absent in primary and present in fallback before fetch

Author: danyx23

functions/test/grapher-config-r2.e2e.test.ts

@@ -45,6 +45,20 @@ async function seedR2(params: {
     expect(response.status).toBe(200)
 }
 
+async function r2HasKey(params: {
+    bucket: "primary" | "fallback"
+    key: string
+}) {
+    const response = await workerFetch(
+        `/__test__/r2-has-key?bucket=${params.bucket}&key=${encodeURIComponent(
+            params.key
+        )}`
+    )
+    expect(response.status).toBe(200)
+    const body = (await response.json()) as { exists: boolean }
+    return body.exists
+}
+
 describe("grapher config endpoint with local R2 bindings", () => {
     beforeAll(async () => {
         worker = await unstable_startWorker({
@@ -114,6 +128,9 @@ describe("grapher config endpoint with local R2 bindings", () => {
             value: lifeExpectancyFixture,
         })
 
+        expect(await r2HasKey({ bucket: "primary", key })).toBe(false)
+        expect(await r2HasKey({ bucket: "fallback", key })).toBe(true)
+
         const response = await workerFetch(
             "/grapher/life-expectancy.config.json"
         )

functions/test/grapher-config.e2e.worker.ts

@@ -1,5 +1,4 @@
 import { onRequest as grapherOnRequest } from "../grapher/[slug].js"
-import { onRequestGet as multiDimOnRequestGet } from "../multi-dim/[slug].json.js"
 import type { Env } from "../_common/env.js"
 
 interface SeedR2Body {
@@ -35,19 +34,15 @@ async function deleteAllObjects(bucket: R2Bucket): Promise<void> {
 }
 
 function makeGrapherContext(request: Request, env: Env) {
-    const envWithAssets = env.ASSETS
-        ? env
-        : ({
-              ...env,
-              ASSETS: {
-                  fetch: async () => new Response("Not found", { status: 404 }),
-                  connect: () => {
-                      throw new Error(
-                          "ASSETS.connect is not implemented in tests"
-                      )
-                  },
-              },
-          } as unknown as Env)
+    const envWithAssets = {
+        ...env,
+        ASSETS: {
+            fetch: async () => new Response("Not found", { status: 404 }),
+            connect: () => {
+                throw new Error("ASSETS.connect is not implemented in tests")
+            },
+        },
+    } as unknown as Env
 
     const context = {
         request,
@@ -67,16 +62,6 @@ function makeGrapherContext(request: Request, env: Env) {
     return context as unknown as Parameters<typeof grapherOnRequest>[0]
 }
 
-function makeMultiDimContext(request: Request, env: Env, slug: string) {
-    const context = {
-        request,
-        env,
-        params: { slug },
-    }
-
-    return context as unknown as Parameters<typeof multiDimOnRequestGet>[0]
-}
-
 export default {
     async fetch(request: Request, env: Env): Promise<Response> {
         const url = new URL(request.url)
@@ -105,12 +90,23 @@ export default {
                 return Response.json({ ok: true })
             }
 
-            if (request.method === "GET" && url.pathname === "/__test__/env") {
-                return Response.json({
-                    branch: env.CF_PAGES_BRANCH,
-                    bucketPath: env.GRAPHER_CONFIG_R2_BUCKET_PATH,
-                    fallbackPath: env.GRAPHER_CONFIG_R2_BUCKET_FALLBACK_PATH,
-                })
+            if (
+                request.method === "GET" &&
+                url.pathname === "/__test__/r2-has-key"
+            ) {
+                const bucket = url.searchParams.get("bucket") as
+                    | "primary"
+                    | "fallback"
+                    | null
+                const key = url.searchParams.get("key")
+                if (!bucket || !key) {
+                    return new Response("Missing bucket or key", {
+                        status: 400,
+                    })
+                }
+
+                const object = await getBucket(env, bucket).head(key)
+                return Response.json({ exists: !!object })
             }
 
             if (
@@ -121,15 +117,6 @@ export default {
                 return grapherOnRequest(context)
             }
 
-            const multiDimMatch = url.pathname.match(
-                /^\/multi-dim\/([^/]+)\.json$/
-            )
-            if (multiDimMatch) {
-                const slug = decodeURIComponent(multiDimMatch[1])
-                const context = makeMultiDimContext(request, env, slug)
-                return multiDimOnRequestGet(context)
-            }
-
             return new Response("Not found", { status: 404 })
         } catch (error) {
             const message =