Skip to content

Commit f181b44

Browse files
committed
chore: update tests remove header fix
1 parent 0689fca commit f181b44

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

cypress/e2e/middleware/enhanced.cy.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@ describe('Enhanced middleware', () => {
66
})
77

88
it('modifies the page props when using request.rewrite()', () => {
9-
cy.request('/_next/data/build-id/en/request-rewrite.json').then((response) => {
10-
expect(response.body).to.have.nested.property('pageProps.showAd', true)
11-
expect(response.body)
12-
.to.have.nested.property('pageProps.message')
13-
.that.includes('This was static (& escaping test &) but has been transformed in')
14-
})
9+
cy.visit('/request-rewrite')
10+
const data = cy.get('script#__NEXT_DATA__')
11+
data.should('contain', '"message":"This was static (& escaping test &) but has been transformed in Arlington","showAd":true')
1512
})
1613

17-
it('passes in headers within request.rewrite()', () => {
14+
it.skip('passes in headers within request.rewrite()', () => {
1815
cy.request('/request-rewrite').then((response) => {
1916
expect(response.headers).to.have.property('x-rewrite-test', 'hello')
2017
})

demos/middleware/middleware.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,7 @@ export async function middleware(req: NextRequest) {
3838

3939
if (pathname.startsWith('/request-rewrite')) {
4040
// request.rewrite() should return the MiddlewareResponse obj instead of the Response obj
41-
const res = await request.rewrite('/static-rewrite', {
42-
headers: {
43-
'x-rewrite-test': 'hello',
44-
'x-rewrite-test-2': 'hello-2'
45-
}
46-
})
41+
const res = await request.rewrite('/static-rewrite')
4742
const message = `This was static (& escaping test &) but has been transformed in ${req.geo?.city}`
4843

4944
// Transform the response HTML and props
@@ -53,7 +48,6 @@ export async function middleware(req: NextRequest) {
5348

5449
res.headers.set('x-modified-edge', 'true')
5550
res.headers.set('x-is-deno', 'Deno' in globalThis ? 'true' : 'false')
56-
console.log({res})
5751
return res
5852
}
5953

packages/next/src/middleware/response.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export class MiddlewareResponse extends NextResponse {
1111
private readonly dataTransforms: NextDataTransform[]
1212
private readonly elementHandlers: Array<[selector: string, handlers: ElementHandlers]>
1313

14+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1415
constructor(public originResponse: Response, init?: ResponseInit) {
1516
// we need to propagate the set-cookie header, so response.cookies.get works correctly
1617
const initHeaders = new Headers()
@@ -22,12 +23,6 @@ export class MiddlewareResponse extends NextResponse {
2223
headers: initHeaders,
2324
})
2425

25-
if (init?.headers) {
26-
Object.entries(init.headers).forEach(([key, value]) => {
27-
this.headers.set(key, value)
28-
})
29-
}
30-
3126
// These are private in Node when compiling, but we access them in Deno at runtime
3227
Object.defineProperty(this, 'dataTransforms', {
3328
value: [],

0 commit comments

Comments
 (0)