do not preserve original cookie, mark some tests as failing in FF

Author: yury-s

packages/playwright-core/src/server/chromium/crNetworkManager.ts

@@ -339,8 +339,7 @@ export class CRNetworkManager {
       // We do not support intercepting redirects.
       if (redirectedFrom || (!this._userRequestInterceptionEnabled && this._protocolRequestInterceptionEnabled)) {
         // Chromium does not preserve header overrides between redirects, so we have to do it ourselves.
-        headersOverride = redirectedFrom?._originalRequestRoute?._alreadyContinuedParams?.headers?.
-            filter(header => header.name.toLowerCase() !== 'cookie');
+        headersOverride = redirectedFrom?._originalRequestRoute?._alreadyContinuedParams?.headers;
         requestPausedSessionInfo!.session._sendMayFail('Fetch.continueRequest', { requestId: requestPausedEvent.requestId, headers: headersOverride });
       } else {
         route = new RouteImpl(requestPausedSessionInfo!.session, requestPausedEvent.requestId);

packages/playwright-core/src/server/network.ts

@@ -329,11 +329,8 @@ export class Route extends SdkObject {
       if (oldUrl.protocol !== newUrl.protocol)
         throw new Error('New URL must have same protocol as overridden URL');
     }
-    if (overrides.headers) {
+    if (overrides.headers)
       overrides.headers = overrides.headers?.filter(header => header.name.toLowerCase() !== 'cookie');
-      const originalCookie = this._request.headers().filter(header => header.name.toLowerCase() === 'cookie');
-      overrides.headers.push(...originalCookie);
-    }
     this._request._setOverrides(overrides);
     if (!overrides.isFallback)
       this._request._context.emit(BrowserContext.Events.RequestContinued, this._request);

tests/page/page-request-continue.spec.ts

@@ -456,7 +456,8 @@ it('continue should not propagate cookie override to redirects', {
   annotation: [
     { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35168' },
   ]
-}, async ({ page, server }) => {
+}, async ({ page, server, browserName }) => {
+  it.fixme(browserName === 'firefox', 'We currently clear all headers during interception in firefox');
   server.setRoute('/set-cookie', (request, response) => {
     response.writeHead(200, { 'Set-Cookie': 'foo=bar;' });
     response.end();
@@ -483,7 +484,8 @@ it('continue should not override cookie', {
   annotation: [
     { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35168' },
   ]
-}, async ({ page, server }) => {
+}, async ({ page, server, browserName }) => {
+  it.fixme(browserName === 'firefox', 'We currently clear all headers during interception in firefox');
   server.setRoute('/set-cookie', (request, response) => {
     response.writeHead(200, { 'Set-Cookie': 'foo=bar;' });
     response.end();
@@ -817,9 +819,7 @@ it('propagate headers cross origin redirect after interception', {
     expect.soft(serverRequest.headers['authorization']).toBeFalsy();
   else
     expect.soft(serverRequest.headers['authorization']).toBe('credentials');
-  // TODO: fix this in juggler.
-  if (browserName !== 'firefox')
-    expect.soft(serverRequest.headers['cookie']).toBeFalsy();
+  expect.soft(serverRequest.headers['cookie']).toBeFalsy();
   expect.soft(serverRequest.headers['custom']).toBe('foo');
 });
 

tests/page/page-route.spec.ts

@@ -166,9 +166,9 @@ it('should properly return navigation response when URL has cookies', async ({ p
   expect(response.status()).toBe(200);
 });
 
-it('should override cookie header', async ({ page, server, browserName }) => {
+it('should not override cookie header', async ({ page, server, browserName }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/16773' });
-  it.fail(browserName !== 'firefox' && !browserName.includes('bidi'));
+  it.fixme(browserName === 'firefox', 'We currently clear all headers during interception in firefox');
 
   await page.goto(server.EMPTY_PAGE);
   await page.evaluate(() => document.cookie = 'original=value');
@@ -184,8 +184,9 @@ it('should override cookie header', async ({ page, server, browserName }) => {
     page.goto(server.EMPTY_PAGE),
   ]);
 
-  expect(cookieValueInRoute).toBe('original=value');
-  expect(serverReq.headers['cookie']).toBe('overridden=value');
+  if (browserName !== 'webkit')
+    expect.soft(cookieValueInRoute).toBe('original=value');
+  expect.soft(serverReq.headers['cookie']).toBe('original=value');
 });
 
 it('should show custom HTTP headers', async ({ page, server }) => {