Skip to content

Commit c212ed0

Browse files
authored
fix use cache flaky test (#849)
1 parent 8bb7e74 commit c212ed0

File tree

3 files changed

+24
-8
lines changed

3 files changed

+24
-8
lines changed

examples/experimental/src/app/use-cache/ssr/page.tsx

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import { FullyCachedComponent, ISRComponent } from "@/components/cached";
1+
import {
2+
FullyCachedComponent,
3+
FullyCachedComponentWithTag,
4+
ISRComponent,
5+
} from "@/components/cached";
26
import { headers } from "next/headers";
37
import { Suspense } from "react";
48

@@ -12,6 +16,9 @@ export default async function Page() {
1216
<Suspense fallback={<p>Loading...</p>}>
1317
<FullyCachedComponent />
1418
</Suspense>
19+
<Suspense fallback={<p>Loading...</p>}>
20+
<FullyCachedComponentWithTag />
21+
</Suspense>
1522
<Suspense fallback={<p>Loading...</p>}>
1623
<ISRComponent />
1724
</Suspense>

examples/experimental/src/components/cached.tsx

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
import { unstable_cacheLife, unstable_cacheTag } from "next/cache";
22

33
export async function FullyCachedComponent() {
4+
"use cache";
5+
return (
6+
<div>
7+
<p data-testid="fully-cached">{Date.now()}</p>
8+
</div>
9+
);
10+
}
11+
12+
export async function FullyCachedComponentWithTag() {
413
"use cache";
514
unstable_cacheTag("fullyTagged");
615
return (
716
<div>
8-
<p data-testid="fullyCached">{Date.now()}</p>
17+
<p data-testid="fully-cached-with-tag">{Date.now()}</p>
918
</div>
1019
);
1120
}

packages/tests-e2e/tests/experimental/use-cache.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { expect, test } from "@playwright/test";
33
test.describe("Composable Cache", () => {
44
test("cached component should work in ssr", async ({ page }) => {
55
await page.goto("/use-cache/ssr");
6-
let fullyCachedElt = page.getByTestId("fullyCached");
6+
let fullyCachedElt = page.getByTestId("fully-cached");
77
let isrElt = page.getByTestId("isr");
88
await expect(fullyCachedElt).toBeVisible();
99
await expect(isrElt).toBeVisible();
@@ -15,7 +15,7 @@ test.describe("Composable Cache", () => {
1515

1616
do {
1717
await page.reload();
18-
fullyCachedElt = page.getByTestId("fullyCached");
18+
fullyCachedElt = page.getByTestId("fully-cached");
1919
isrElt = page.getByTestId("isr");
2020
await expect(fullyCachedElt).toBeVisible();
2121
await expect(isrElt).toBeVisible();
@@ -31,7 +31,7 @@ test.describe("Composable Cache", () => {
3131
request,
3232
}) => {
3333
await page.goto("/use-cache/ssr");
34-
const fullyCachedElt = page.getByTestId("fullyCached");
34+
const fullyCachedElt = page.getByTestId("fully-cached-with-tag");
3535
await expect(fullyCachedElt).toBeVisible();
3636

3737
const initialFullyCachedText = await fullyCachedElt.textContent();
@@ -49,7 +49,7 @@ test.describe("Composable Cache", () => {
4949
test("cached component should work in isr", async ({ page }) => {
5050
await page.goto("/use-cache/isr");
5151

52-
let fullyCachedElt = page.getByTestId("fullyCached");
52+
let fullyCachedElt = page.getByTestId("fully-cached");
5353
let isrElt = page.getByTestId("isr");
5454

5555
await expect(fullyCachedElt).toBeVisible();
@@ -65,7 +65,7 @@ test.describe("Composable Cache", () => {
6565
while (isrText === initialIsrText) {
6666
await page.reload();
6767
isrElt = page.getByTestId("isr");
68-
fullyCachedElt = page.getByTestId("fullyCached");
68+
fullyCachedElt = page.getByTestId("fully-cached");
6969
await expect(isrElt).toBeVisible();
7070
isrText = await isrElt.textContent();
7171
await expect(fullyCachedElt).toBeVisible();
@@ -76,7 +76,7 @@ test.describe("Composable Cache", () => {
7676

7777
do {
7878
await page.reload();
79-
fullyCachedElt = page.getByTestId("fullyCached");
79+
fullyCachedElt = page.getByTestId("fully-cached");
8080
isrElt = page.getByTestId("isr");
8181
await expect(fullyCachedElt).toBeVisible();
8282
await expect(isrElt).toBeVisible();

0 commit comments

Comments
 (0)