test: add cases for app router non-ascii paths

opennextjs · Oct 7, 2024 · 2c999c5 · 2c999c5
1 parent fa75d60
commit 2c999c5
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 3 deletions.
diff --git a/tests/e2e/on-demand-app.test.ts b/tests/e2e/on-demand-app.test.ts
@@ -45,6 +45,20 @@ test.describe('app router on-demand revalidation', () => {
       revalidateApiPath: '/api/on-demand-revalidate/tag?tag=show-4',
       expectedH1Content: 'Hello, Statically fetched show 4',
     },
+    {
+      label: 'revalidatePath (prerendered page with dynamic path) - non-ASCII variant',
+      prerendered: true,
+      pagePath: '/product/事前レンダリング',
+      revalidateApiPath: `/api/on-demand-revalidate/path?path=/product/事前レンダリング`,
+      expectedH1Content: 'Product 事前レンダリング',
+    },
+    {
+      label: 'revalidatePath (not prerendered page with dynamic path) - non-ASCII variant',
+      prerendered: false,
+      pagePath: '/product/事前レンダリングされていない',
+      revalidateApiPath: `/api/on-demand-revalidate/path?path=/product/事前レンダリングされていない`,
+      expectedH1Content: 'Product 事前レンダリングされていない',
+    },
   ]) {
     test(label, async ({ page, pollUntilHeadersMatch, serverComponents }) => {
       // in case there is retry or some other test did hit that path before

diff --git a/tests/fixtures/server-components/app/api/on-demand-revalidate/path/route.ts b/tests/fixtures/server-components/app/api/on-demand-revalidate/path/route.ts
@@ -3,10 +3,19 @@ import { revalidatePath } from 'next/cache'
 
 export async function GET(request: NextRequest) {
   const url = new URL(request.url)
-  const pathToRevalidate = url.searchParams.get('path') ?? '/static-fetch/[id]/page'
+  let pathToRevalidate = url.searchParams.get('path')
+
+  if (pathToRevalidate) {
+    pathToRevalidate = encodeURI(pathToRevalidate)
+  } else {
+    pathToRevalidate = '/static-fetch/[id]/page'
+  }
 
   revalidatePath(pathToRevalidate)
-  return NextResponse.json({ revalidated: true, now: new Date().toISOString() })
+  return NextResponse.json({
+    revalidated: true,
+    now: new Date().toISOString(),
+  })
 }
 
 export const dynamic = 'force-dynamic'
diff --git a/tests/fixtures/server-components/app/api/purge-cdn/route.ts b/tests/fixtures/server-components/app/api/purge-cdn/route.ts
@@ -15,7 +15,7 @@ export async function GET(request: NextRequest) {
     )
   }
   try {
-    await purgeCache({ tags: [`_N_T_${pathToPurge}`] })
+    await purgeCache({ tags: [`_N_T_${encodeURI(pathToPurge)}`] })
     return NextResponse.json(
       {
         status: 'ok',

diff --git a/tests/fixtures/server-components/app/product/[slug]/page.js b/tests/fixtures/server-components/app/product/[slug]/page.js
@@ -0,0 +1,20 @@
+const Product = ({ params }) => (
+  <div>
+    <h1>Product {decodeURI(params.slug)}</h1>
+    <p>
+      This page uses generateStaticParams() to prerender a Product
+      <span data-testid="date-now">{new Date().toISOString()}</span>
+    </p>
+  </div>
+)
+
+export async function generateStaticParams() {
+  return [
+    {
+      // Japanese prerendered (non-ascii)
+      slug: '事前レンダリング',
+    },
+  ]
+}
+
+export default Product
diff --git a/tests/integration/cache-handler.test.ts b/tests/integration/cache-handler.test.ts
@@ -360,6 +360,7 @@ describe('plugin', () => {
       '/api/static/first',
       '/api/static/second',
       '/index',
+      '/product/事前レンダリング',
       '/revalidate-fetch',
       '/static-fetch-1',
       '/static-fetch-2',