Skip to content

Commit 22ea91b

Browse files
authored
test: adjust fixtures to await cookies(), params(), headers() (#3146)
1 parent 5713ffe commit 22ea91b

File tree

12 files changed

+50
-38
lines changed
  • tests/fixtures

12 files changed

+50
-38
lines changed

tests/fixtures/dist-dir/app/api/headers/route.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { cookies } from 'next/headers'
22

33
export const GET = async () => {
4-
cookies().set('foo', 'foo1')
5-
cookies().set('bar', 'bar1')
4+
const localCookies = await cookies()
5+
localCookies.set('foo', 'foo1')
6+
localCookies.set('bar', 'bar1')
67

78
// Key, value, options
8-
cookies().set('test1', 'value1', { secure: true })
9+
localCookies.set('test1', 'value1', { secure: true })
910

1011
// One object
11-
cookies().set({
12+
localCookies.set({
1213
name: 'test2',
1314
value: 'value2',
1415
httpOnly: true,

tests/fixtures/middleware-src/src/app/test/next/page.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { headers } from 'next/headers'
22

3-
export default function Page() {
4-
const headersList = headers()
3+
export default async function Page() {
4+
const headersList = await headers()
55
const message = headersList.get('x-hello-from-middleware-req')
66

77
return (

tests/fixtures/middleware-trailing-slash/app/test/next/page.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { headers } from 'next/headers'
22

3-
export default function Page() {
4-
const headersList = headers()
3+
export default async function Page() {
4+
const headersList = await headers()
55
const message = headersList.get('x-hello-from-middleware-req')
66

77
return (

tests/fixtures/middleware/app/test/next/page.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { headers } from 'next/headers'
22

3-
export default function Page() {
4-
const headersList = headers()
3+
export default async function Page() {
4+
const headersList = await headers()
55
const message = headersList.get('x-hello-from-middleware-req')
66

77
return (

tests/fixtures/nx-integrated/apps/custom-dist-dir/app/api/headers/route.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { cookies } from 'next/headers'
22

33
export const GET = async () => {
4-
cookies().set('foo', 'foo1')
5-
cookies().set('bar', 'bar1')
4+
const localCookies = await cookies()
5+
localCookies.set('foo', 'foo1')
6+
localCookies.set('bar', 'bar1')
67

78
// Key, value, options
8-
cookies().set('test1', 'value1', { secure: true })
9+
localCookies.set('test1', 'value1', { secure: true })
910

1011
// One object
11-
cookies().set({
12+
localCookies.set({
1213
name: 'test2',
1314
value: 'value2',
1415
httpOnly: true,
@@ -23,4 +24,4 @@ export const GET = async () => {
2324
['Set-Cookie', 'baz=baz2'],
2425
],
2526
})
26-
}
27+
}

tests/fixtures/revalidate-fetch/app/dynamic-posts/[id]/page.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ async function getData(params) {
99
}
1010

1111
export default async function Page({ params }) {
12-
const data = await getData(params)
12+
const { id } = await params
13+
const data = await getData({ id })
1314

1415
return (
1516
<>
@@ -19,7 +20,7 @@ export default async function Page({ params }) {
1920
<dt>Show</dt>
2021
<dd data-testid="name">{data.name}</dd>
2122
<dt>Param</dt>
22-
<dd data-testid="id">{params.id}</dd>
23+
<dd data-testid="id">{id}</dd>
2324
<dt>Time</dt>
2425
<dd data-testid="date-now">{Date.now()}</dd>
2526
<dt>Time from fetch response</dt>

tests/fixtures/revalidate-fetch/app/posts/[id]/page.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ async function getData(params) {
1313
}
1414

1515
export default async function Page({ params }) {
16-
const data = await getData(params)
16+
const { id } = await params
17+
const data = await getData({ id })
1718

1819
return (
1920
<>
@@ -24,7 +25,7 @@ export default async function Page({ params }) {
2425
<dt>Show</dt>
2526
<dd data-testid="name">{data.name}</dd>
2627
<dt>Param</dt>
27-
<dd data-testid="id">{params.id}</dd>
28+
<dd data-testid="id">{id}</dd>
2829
<dt>Time</dt>
2930
<dd data-testid="date-now">{Date.now()}</dd>
3031
<dt>Time from fetch response</dt>

tests/fixtures/revalidate-fetch/app/same-fetch-multiple-times/[id]/page.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ async function getData(params) {
2323
}
2424

2525
export default async function Page({ params }) {
26-
const data = await getData(params)
26+
const { id } = await params
27+
const data = await getData({ id })
2728

2829
return (
2930
<>
@@ -32,7 +33,7 @@ export default async function Page({ params }) {
3233
<dt>Show</dt>
3334
<dd data-testid="name">{data.name}</dd>
3435
<dt>Param</dt>
35-
<dd data-testid="id">{params.id}</dd>
36+
<dd data-testid="id">{id}</dd>
3637
<dt>Time</dt>
3738
<dd data-testid="date-now">{Date.now()}</dd>
3839
<dt>Time from fetch response</dt>

tests/fixtures/server-components/app/api/static/[slug]/route.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ export function generateStaticParams() {
44
return [{ slug: 'first' }, { slug: 'second' }]
55
}
66

7-
export const GET = (_req: NextRequest, { params }) => {
8-
return NextResponse.json({ params })
7+
export const GET = async (_req: NextRequest, { params }) => {
8+
return NextResponse.json({ params: await params })
99
}
Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
const Product = ({ params }) => (
2-
<div>
3-
<h1>Product {decodeURIComponent(params.slug)}</h1>
4-
<p>
5-
This page uses generateStaticParams() to prerender a Product
6-
<span data-testid="date-now">{new Date().toISOString()}</span>
7-
</p>
8-
</div>
9-
)
1+
const Product = async ({ params }) => {
2+
const { slug } = await params
3+
return (
4+
<div>
5+
<h1>Product {decodeURIComponent(slug)}</h1>
6+
<p>
7+
This page uses generateStaticParams() to prerender a Product
8+
<span data-testid="date-now">{new Date().toISOString()}</span>
9+
</p>
10+
</div>
11+
)
12+
}
1013

1114
export async function generateStaticParams() {
1215
return [
@@ -17,4 +20,6 @@ export async function generateStaticParams() {
1720
]
1821
}
1922

23+
export const dynamic = 'force-static'
24+
2025
export default Product

0 commit comments

Comments
 (0)