Skip to content

Commit 60257e5

Browse files
yobottehgyobottehg
committed
fix(next-drupal)!: upgrade tests to new async request objects
1 parent e85ffb1 commit 60257e5

File tree

2 files changed

+18
-29
lines changed

2 files changed

+18
-29
lines changed

‎packages/next-drupal/src/draft.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ export async function enableDraftMode(
2323
const path = searchParams.get("path")
2424

2525
const cookieStore = await cookies()
26-
const draftModeStore = await draftMode()
2726
// Enable Draft Mode by setting the cookie
28-
draftModeStore.enable()
27+
;(await draftMode()).enable()
2928

3029
// Override the default SameSite=lax.
3130
// See https://github.com/vercel/next.js/issues/49927
@@ -58,9 +57,8 @@ export async function enableDraftMode(
5857

5958
export async function disableDraftMode() {
6059
const cookieStore = await cookies()
61-
const draftModeStore = await draftMode()
6260
cookieStore.delete(DRAFT_DATA_COOKIE_NAME)
63-
draftModeStore.disable()
61+
;(await draftMode()).disable()
6462

6563
return new Response("Draft mode is disabled")
6664
}
@@ -73,8 +71,10 @@ export interface DraftData {
7371
export async function getDraftData() {
7472
let data: DraftData = {}
7573
const cookieStore = await cookies()
76-
const draftModeStore = await draftMode()
77-
if (draftModeStore.isEnabled && cookieStore.has(DRAFT_DATA_COOKIE_NAME)) {
74+
if (
75+
(await draftMode()).isEnabled &&
76+
cookieStore.has(DRAFT_DATA_COOKIE_NAME)
77+
) {
7878
data = JSON.parse(cookieStore.get(DRAFT_DATA_COOKIE_NAME)?.value || "{}")
7979
}
8080

‎packages/next-drupal/tests/NextDrupalPages/pages-router-methods.test.ts‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import type {
1313
JsonApiResourceWithPath,
1414
NextDrupalAuth,
1515
} from "../../src"
16-
16+
import { NextApiRequest, NextApiResponse } from "../__mocks__/next"
1717
jest.setTimeout(10000)
1818

1919
afterEach(() => {
@@ -1117,13 +1117,12 @@ describe("preview()", () => {
11171117
}
11181118

11191119
test("turns on preview mode and clears preview data", async () => {
1120-
// @ts-expect-error
11211120
const request = new NextApiRequest()
1122-
// @ts-expect-error
11231121
const response = new NextApiResponse()
11241122
const drupal = new NextDrupalPages(BASE_URL)
11251123
spyOnFetch({ responseBody: validationPayload })
11261124

1125+
// @ts-expect-error
11271126
await drupal.preview(request, response)
11281127

11291128
expect(response.clearPreviewData).toBeCalledTimes(1)
@@ -1136,9 +1135,7 @@ describe("preview()", () => {
11361135

11371136
test("does not enable preview mode if validation fails", async () => {
11381137
const logger = mockLogger()
1139-
// @ts-expect-error
11401138
const request = new NextApiRequest()
1141-
// @ts-expect-error
11421139
const response = new NextApiResponse()
11431140
const drupal = new NextDrupalPages(BASE_URL, { debug: true, logger })
11441141
const status = 403
@@ -1151,6 +1148,7 @@ describe("preview()", () => {
11511148
},
11521149
})
11531150

1151+
// @ts-expect-error
11541152
await drupal.preview(request, response)
11551153

11561154
expect(logger.debug).toBeCalledWith(
@@ -1162,13 +1160,12 @@ describe("preview()", () => {
11621160
})
11631161

11641162
test("does not turn on draft mode by default", async () => {
1165-
// @ts-expect-error
11661163
const request = new NextApiRequest()
1167-
// @ts-expect-error
11681164
const response = new NextApiResponse()
11691165
const drupal = new NextDrupalPages(BASE_URL)
11701166
spyOnFetch({ responseBody: validationPayload })
11711167

1168+
// @ts-expect-error
11721169
await drupal.preview(request, response)
11731170

11741171
expect(response.setDraftMode).toBeCalledTimes(0)
@@ -1179,9 +1176,7 @@ describe("preview()", () => {
11791176
})
11801177

11811178
test("optionally turns on draft mode", async () => {
1182-
// @ts-expect-error
11831179
const request = new NextApiRequest()
1184-
// @ts-expect-error
11851180
const response = new NextApiResponse()
11861181
const logger = mockLogger()
11871182
const drupal = new NextDrupalPages(BASE_URL, {
@@ -1191,6 +1186,7 @@ describe("preview()", () => {
11911186
spyOnFetch({ responseBody: validationPayload })
11921187

11931188
const options = { enable: true }
1189+
// @ts-expect-error
11941190
await drupal.preview(request, response, options)
11951191

11961192
expect(response.setDraftMode).toBeCalledWith(options)
@@ -1203,9 +1199,7 @@ describe("preview()", () => {
12031199
})
12041200

12051201
test("updates preview mode cookie’s sameSite flag", async () => {
1206-
// @ts-expect-error
12071202
const request = new NextApiRequest()
1208-
// @ts-expect-error
12091203
const response = new NextApiResponse()
12101204
const drupal = new NextDrupalPages(BASE_URL)
12111205
spyOnFetch({ responseBody: validationPayload })
@@ -1221,6 +1215,7 @@ describe("preview()", () => {
12211215
const cookies = response.getHeader("Set-Cookie")
12221216
cookies[0] = cookies[0].replace("SameSite=Lax", "SameSite=None; Secure")
12231217

1218+
// @ts-expect-error
12241219
await drupal.preview(request, response)
12251220

12261221
expect(response.getHeader).toHaveBeenLastCalledWith("Set-Cookie")
@@ -1229,14 +1224,13 @@ describe("preview()", () => {
12291224
})
12301225

12311226
test("redirects to the given path", async () => {
1232-
// @ts-expect-error
12331227
const request = new NextApiRequest()
1234-
// @ts-expect-error
12351228
const response = new NextApiResponse()
12361229
const logger = mockLogger()
12371230
const drupal = new NextDrupalPages(BASE_URL, { debug: true, logger })
12381231
spyOnFetch({ responseBody: validationPayload })
12391232

1233+
// @ts-expect-error
12401234
await drupal.preview(request, response)
12411235

12421236
expect(response.setPreviewData).toBeCalledWith({
@@ -1249,9 +1243,7 @@ describe("preview()", () => {
12491243
})
12501244

12511245
test("returns a 422 response on error", async () => {
1252-
// @ts-expect-error
12531246
const request = new NextApiRequest()
1254-
// @ts-expect-error
12551247
const response = new NextApiResponse()
12561248
const logger = mockLogger()
12571249
const drupal = new NextDrupalPages(BASE_URL, { debug: true, logger })
@@ -1260,6 +1252,7 @@ describe("preview()", () => {
12601252
throw new Error(message)
12611253
})
12621254

1255+
// @ts-expect-error
12631256
await drupal.preview(request, response)
12641257

12651258
expect(logger.debug).toHaveBeenLastCalledWith(`Preview failed: ${message}`)
@@ -1270,34 +1263,31 @@ describe("preview()", () => {
12701263

12711264
describe("previewDisable()", () => {
12721265
test("clears preview data", async () => {
1273-
// @ts-expect-error
12741266
const request = new NextApiRequest()
1275-
// @ts-expect-error
12761267
const response = new NextApiResponse()
12771268
const drupal = new NextDrupalPages(BASE_URL)
12781269

1270+
// @ts-expect-error
12791271
await drupal.previewDisable(request, response)
12801272
expect(response.clearPreviewData).toBeCalledTimes(1)
12811273
})
12821274

12831275
test("disables draft mode", async () => {
1284-
// @ts-expect-error
12851276
const request = new NextApiRequest()
1286-
// @ts-expect-error
12871277
const response = new NextApiResponse()
12881278
const drupal = new NextDrupalPages(BASE_URL)
12891279

1280+
// @ts-expect-error
12901281
await drupal.previewDisable(request, response)
12911282
expect(response.setDraftMode).toBeCalledWith({ enable: false })
12921283
})
12931284

12941285
test("deletes the draft cookie", async () => {
1295-
// @ts-expect-error
12961286
const request = new NextApiRequest()
1297-
// @ts-expect-error
12981287
const response = new NextApiResponse()
12991288
const drupal = new NextDrupalPages(BASE_URL)
13001289

1290+
// @ts-expect-error
13011291
await drupal.previewDisable(request, response)
13021292
const cookies = response.getHeader("Set-Cookie")
13031293
expect(cookies[cookies.length - 1]).toBe(
@@ -1306,12 +1296,11 @@ describe("previewDisable()", () => {
13061296
})
13071297

13081298
test('redirects to "/"', async () => {
1309-
// @ts-expect-error
13101299
const request = new NextApiRequest()
1311-
// @ts-expect-error
13121300
const response = new NextApiResponse()
13131301
const drupal = new NextDrupalPages(BASE_URL)
13141302

1303+
// @ts-expect-error
13151304
await drupal.previewDisable(request, response)
13161305
expect(response.writeHead).toBeCalledWith(307, { Location: "/" })
13171306
expect(response.end).toBeCalled()

0 commit comments

Comments
 (0)