Add regression test for conflicting search and route params (#81249)

gaojude · web-flow · commit ed892f70c388 · 2025-07-03T21:44:24.000-04:00
Follow-up to #81209
diff --git a/test/e2e/app-dir/conflicting-search-and-route-params/app/api/[id]/route.ts b/test/e2e/app-dir/conflicting-search-and-route-params/app/api/[id]/route.ts
@@ -0,0 +1,14 @@
+import { NextRequest } from 'next/server'
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> }
+) {
+  const { id: routeId } = await params
+  const searchId = request.nextUrl.searchParams.get('id')
+
+  return Response.json({
+    routeParam: routeId,
+    searchParam: searchId,
+  })
+}
diff --git a/test/e2e/app-dir/conflicting-search-and-route-params/app/layout.tsx b/test/e2e/app-dir/conflicting-search-and-route-params/app/layout.tsx
@@ -0,0 +1,9 @@
+import { ReactNode } from 'react'
+
+export default function Root({ children }: { children: ReactNode }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/conflicting-search-and-route-params/app/render/[id]/page.tsx b/test/e2e/app-dir/conflicting-search-and-route-params/app/render/[id]/page.tsx
@@ -0,0 +1,34 @@
+import { Suspense } from 'react'
+
+async function SearchAndRouteParams({
+  searchParams,
+  params,
+}: {
+  searchParams: Promise<{ id?: string }>
+  params: Promise<{ id: string }>
+}) {
+  const { id: searchId } = await searchParams
+  const { id: routeId } = await params
+
+  return (
+    <div>
+      <h1>Search and Route Parameters</h1>
+      <p id="route-param">Route param id: {routeId}</p>
+      <p id="search-param">Search param id: {searchId || 'not provided'}</p>
+    </div>
+  )
+}
+
+export default function Page({
+  searchParams,
+  params,
+}: {
+  searchParams: Promise<{ id?: string }>
+  params: Promise<{ id: string }>
+}) {
+  return (
+    <Suspense fallback={<div>Loading...</div>}>
+      <SearchAndRouteParams searchParams={searchParams} params={params} />
+    </Suspense>
+  )
+}
diff --git a/test/e2e/app-dir/conflicting-search-and-route-params/conflicting-search-and-route-params.test.ts b/test/e2e/app-dir/conflicting-search-and-route-params/conflicting-search-and-route-params.test.ts
@@ -0,0 +1,28 @@
+import { nextTestSetup } from 'e2e-utils'
+
+describe('conflicting-search-and-route-params', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+  })
+
+  it('should handle conflicting search and route params on page', async () => {
+    const browser = await next.browser('/render/123?id=456')
+
+    const routeParamText = await browser.elementByCss('#route-param').text()
+    expect(routeParamText).toContain('Route param id: 123')
+
+    const searchParamText = await browser.elementByCss('#search-param').text()
+    expect(searchParamText).toContain('Search param id: 456')
+  })
+
+  it('should handle conflicting search and route params on API route', async () => {
+    // Test with route param "789" and search param "abc"
+    const response = await next.fetch('/api/789?id=abc')
+    const data = await response.json()
+
+    expect(data).toEqual({
+      routeParam: '789',
+      searchParam: 'abc',
+    })
+  })
+})
diff --git a/test/e2e/app-dir/conflicting-search-and-route-params/next.config.js b/test/e2e/app-dir/conflicting-search-and-route-params/next.config.js
@@ -0,0 +1,6 @@
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {}
+
+module.exports = nextConfig
