Commit 46b94cdf authored by Swarnava Sengupta's avatar Swarnava Sengupta

refactor(test): use next.render$ and fix comment in HMR instrumentation test

Use next.render$() which returns a cheerio instance directly, removing
the manual cheerio.load() calls and the cheerio import.
parent 4ab7b0c7
import { nextTestSetup } from 'e2e-utils' import { nextTestSetup } from 'e2e-utils'
import { retry } from 'next-test-utils' import { retry } from 'next-test-utils'
import cheerio from 'cheerio'
describe('dev-fetch-hmr-instrumentation', () => { describe('dev-fetch-hmr-instrumentation', () => {
const { next } = nextTestSetup({ const { next } = nextTestSetup({
...@@ -12,11 +11,11 @@ describe('dev-fetch-hmr-instrumentation', () => { ...@@ -12,11 +11,11 @@ describe('dev-fetch-hmr-instrumentation', () => {
// had a chance to wrap it. Every HMR event would therefore strip any // had a chance to wrap it. Every HMR event would therefore strip any
// third-party fetch instrumentation (e.g. @vercel/otel trace-context // third-party fetch instrumentation (e.g. @vercel/otel trace-context
// propagation). The fix makes resetFetch() unwrap only the Next.js // propagation). The fix makes resetFetch() unwrap only the Next.js
// patchFetch() layer via _nextOriginalFetch, preserving instrumentation. // patchFetch() layer via _nextPrePatchFetch, preserving instrumentation.
it('should preserve instrumentation fetch wrapping after HMR', async () => { it('should preserve instrumentation fetch wrapping after HMR', async () => {
// 1. Cold start: instrumentation.ts wraps fetch, the probe should work. // 1. Cold start: instrumentation.ts wraps fetch, the probe should work.
const html = await next.render('/') const $ = await next.render$('/')
expect(cheerio.load(html)('#instrumented').text()).toBe('yes') expect($('#instrumented').text()).toBe('yes')
// 2. Trigger HMR by editing the page component. // 2. Trigger HMR by editing the page component.
await next.patchFile('app/page.tsx', (content) => await next.patchFile('app/page.tsx', (content) =>
...@@ -25,12 +24,11 @@ describe('dev-fetch-hmr-instrumentation', () => { ...@@ -25,12 +24,11 @@ describe('dev-fetch-hmr-instrumentation', () => {
// 3. After HMR, the instrumentation wrapper must still be active. // 3. After HMR, the instrumentation wrapper must still be active.
await retry(async () => { await retry(async () => {
const html2 = await next.render('/') const $2 = await next.render$('/')
const $ = cheerio.load(html2)
// Confirm HMR actually happened // Confirm HMR actually happened
expect($('#update').text()).toBe('touch to trigger HMR 2') expect($2('#update').text()).toBe('touch to trigger HMR 2')
// Confirm instrumentation survived // Confirm instrumentation survived
expect($('#instrumented').text()).toBe('yes') expect($2('#instrumented').text()).toBe('yes')
}) })
}) })
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment