fix unit test

Nicolas Dorseuil · Nicolas Dorseuil · commit 4710f0aa561d · 2025-07-04T12:00:27.000+02:00
diff --git a/packages/tests-unit/tests/adapters/cache.test.ts b/packages/tests-unit/tests/adapters/cache.test.ts
@@ -364,9 +364,12 @@ describe("CacheHandler", () => {
       });
 
       expect(incrementalCache.set).toHaveBeenCalledWith(
-        "key",
+        {
+          baseKey: "key",
+          cacheType: "cache",
+          buildId: "undefined-build-id",
+        },
         { type: "route", body: "{}", meta: { status: 200, headers: {} } },
-        "cache",
       );
     });
 
@@ -381,13 +384,16 @@ describe("CacheHandler", () => {
       });
 
       expect(incrementalCache.set).toHaveBeenCalledWith(
-        "key",
+        {
+          baseKey: "key",
+          cacheType: "cache",
+          buildId: "undefined-build-id",
+        },
         {
           type: "route",
           body: Buffer.from("{}").toString("base64"),
           meta: { status: 200, headers: { "content-type": "image/png" } },
         },
-        "cache",
       );
     });
 
@@ -401,13 +407,16 @@ describe("CacheHandler", () => {
       });
 
       expect(incrementalCache.set).toHaveBeenCalledWith(
-        "key",
+        {
+          baseKey: "key",
+          cacheType: "cache",
+          buildId: "undefined-build-id",
+        },
         {
           type: "page",
           html: "<html></html>",
           json: {},
         },
-        "cache",
       );
     });
 
@@ -421,14 +430,17 @@ describe("CacheHandler", () => {
       });
 
       expect(incrementalCache.set).toHaveBeenCalledWith(
-        "key",
+        {
+          baseKey: "key",
+          cacheType: "cache",
+          buildId: "undefined-build-id",
+        },
         {
           type: "app",
           html: "<html></html>",
           rsc: "rsc",
           meta: { status: 200, headers: {} },
         },
-        "cache",
       );
     });
 
@@ -442,14 +454,17 @@ describe("CacheHandler", () => {
       });
 
       expect(incrementalCache.set).toHaveBeenCalledWith(
-        "key",
+        {
+          baseKey: "key",
+          cacheType: "cache",
+          buildId: "undefined-build-id",
+        },
         {
           type: "app",
           html: "<html></html>",
           rsc: "rsc",
           meta: { status: 200, headers: {} },
         },
-        "cache",
       );
     });
 
@@ -467,7 +482,11 @@ describe("CacheHandler", () => {
       });
 
       expect(incrementalCache.set).toHaveBeenCalledWith(
-        "key",
+        {
+          baseKey: "key",
+          cacheType: "fetch",
+          buildId: "undefined-build-id",
+        },
         {
           kind: "FETCH",
           data: {
@@ -479,20 +498,22 @@ describe("CacheHandler", () => {
           },
           revalidate: 60,
         },
-        "fetch",
       );
     });
 
     it("Should set cache when for REDIRECT", async () => {
       await cache.set("key", { kind: "REDIRECT", props: {} });
 
       expect(incrementalCache.set).toHaveBeenCalledWith(
-        "key",
+        {
+          baseKey: "key",
+          cacheType: "cache",
+          buildId: "undefined-build-id",
+        },
         {
           type: "redirect",
           props: {},
         },
-        "cache",
       );
     });
 
diff --git a/packages/tests-unit/tests/utils/cache.test.ts b/packages/tests-unit/tests/utils/cache.test.ts
@@ -22,41 +22,41 @@ describe("createCacheKey", () => {
     globalThis.openNextConfig = originalGlobalThis.openNextConfig;
   });
 
-  test("prepends build ID for non-data cache entries", () => {
+  test("have a defined build id for non-data cache entries", () => {
     process.env.NEXT_BUILD_ID = "test-build-id";
     const key = "test-key";
 
-    const result = createCacheKey(key, false);
+    const result = createCacheKey({ key, type: "cache" });
 
-    expect(result).toBe("test-build-id/test-key");
+    expect(result.buildId).toBe("test-build-id");
   });
 
-  test("prepends build ID for data cache when persistentDataCache is not enabled", () => {
+  test("have a defined build id for data cache when persistentDataCache is not enabled", () => {
     process.env.NEXT_BUILD_ID = "test-build-id";
     globalThis.openNextConfig.dangerous.persistentDataCache = false;
     const key = "test-key";
 
-    const result = createCacheKey(key, true);
+    const result = createCacheKey({ key, type: "fetch" });
 
-    expect(result).toBe("test-build-id/test-key");
+    expect(result.buildId).toBe("test-build-id");
   });
 
   test("does not prepend build ID for data cache when persistentDataCache is enabled", () => {
     process.env.NEXT_BUILD_ID = "test-build-id";
     globalThis.openNextConfig.dangerous.persistentDataCache = true;
     const key = "test-key";
 
-    const result = createCacheKey(key, true);
+    const result = createCacheKey({ key, type: "fetch" });
 
-    expect(result).toBe("test-key");
+    expect(result.buildId).toBeUndefined();
   });
 
   test("handles missing build ID", () => {
     process.env.NEXT_BUILD_ID = undefined;
     const key = "test-key";
 
-    const result = createCacheKey(key, false);
+    const result = createCacheKey({ key, type: "fetch" });
 
-    expect(result).toBe("test-key");
+    expect(result.buildId).toBeUndefined();
   });
 });
