skip injection for non-chromium browsers

packages/driver/cypress/e2e/issues/1244.cy.js

@@ -6,16 +6,16 @@ describe('issue 1244', () => {
 
         // not all pages that get unloaded during this spec have getCounters()
         if (win.location.href.includes('issue-1244.html')) {
-          // expect(win.getCounters()).to.deep.equal({ getCounter: 0, setCounter: 0 })
+          expect(win.getCounters()).to.deep.equal({ getCounter: 0, setCounter: 0 })
         }
       })
     })
   })
 
-  for (const [el, target, action] of [['button', 'form', 'submit']]) {
+  for (const [el, target, action] of [['button', 'form', 'submit'], ['a', 'a', 'click']]) {
     // <form> submit, <a> click
     // TODO(webkit): fix+unskip for webkit release, or make skip more specific (only 4 of these generated tests fail in webkit)
-    describe(`<${target}> ${action}`, { browser: '!webkit', retries: 0 }, () => {
+    describe(`<${target}> ${action}`, { browser: '!webkit' }, () => {
       it('correctly redirects when target=_top with target.target =', () => {
         cy.get(`${el}.setTarget`).click()
         cy.get('#dom').should('contain', 'DOM')

packages/proxy/lib/http/index.ts

@@ -26,7 +26,7 @@ import type { Request, Response } from 'express'
 import type { RemoteStates } from '@packages/server/lib/remote_states'
 import type { CookieJar, SerializableAutomationCookie } from '@packages/server/lib/util/cookies'
 import type { ResourceTypeAndCredentialManager } from '@packages/server/lib/util/resourceTypeAndCredentialManager'
-import type { ProtocolManagerShape } from '@packages/types'
+import type { FoundBrowser, ProtocolManagerShape } from '@packages/types'
 import type Protocol from 'devtools-protocol'
 import type { ServiceWorkerClientEvent } from './util/service-worker-manager'
 
@@ -101,6 +101,7 @@ export type ServerCtx = Readonly<{
   socket: CyServer.Socket
   request: any
   serverBus: EventEmitter
+  getCurrentBrowser: () => FoundBrowser
 }>
 
 const READONLY_MIDDLEWARE_KEYS: (keyof HttpMiddlewareThis<{}>)[] = [
@@ -272,6 +273,7 @@ export class Http {
   middleware: HttpMiddlewareStacks
   netStubbingState: NetStubbingState
   preRequests: PreRequests = new PreRequests()
+  getCurrentBrowser: () => FoundBrowser
   request: any
   socket: CyServer.Socket
   serverBus: EventEmitter
@@ -296,6 +298,7 @@ export class Http {
     this.serverBus = opts.serverBus
     this.resourceTypeAndCredentialManager = opts.resourceTypeAndCredentialManager
     this.getCookieJar = opts.getCookieJar
+    this.getCurrentBrowser = opts.getCurrentBrowser
 
     if (typeof opts.middleware === 'undefined') {
       this.middleware = defaultMiddleware
@@ -361,6 +364,7 @@ export class Http {
         this.preRequests.removePendingRequest(pendingRequest)
       },
       protocolManager: this.protocolManager,
+      getCurrentBrowser: this.getCurrentBrowser,
     }
 
     const onError = (error: Error): Promise<void> => {

packages/proxy/lib/http/response-middleware.ts

@@ -839,7 +839,8 @@ const MaybeInjectServiceWorker: ResponseMiddleware = function () {
 
   span?.setAttributes({ hasServiceWorkerHeader: hasHeader })
 
-  if (!hasHeader) {
+  // skip if we don't have the header or we're not in chromium
+  if (!hasHeader || this.getCurrentBrowser().family !== 'chromium') {
     span?.end()
 
     return this.next()

packages/proxy/lib/http/util/prerequests.ts

@@ -167,7 +167,7 @@ export class PreRequests {
     const key = `${browserPreRequest.method}-${tryDecodeURI(browserPreRequest.url)}`
 
     // if we have a pending request to remove, we should remove it now and return
-    // since we don't want to add this pre-request to the pending list,
+    // since we don't want to proceed with this pre-request anymore. In practice,
     // this typically happens when we receive a cached response while executing
     // the async function to add the pre-request
     if (this.checkAndRemovePendingPreRequest(browserPreRequest.requestId)) {
@@ -212,7 +212,7 @@ export class PreRequests {
       return
     }
 
-    debugVerbose('Caching pre-request %s to be matched later. %o', key, browserPreRequest.requestId)
+    debugVerbose('Caching pre-request %s to be matched later. %o', key, browserPreRequest)
     this.pendingPreRequests.push(key, {
       browserPreRequest,
       cdpRequestWillBeSentTimestamp: browserPreRequest.cdpRequestWillBeSentTimestamp,
@@ -255,6 +255,9 @@ export class PreRequests {
       return !matches
     })
 
+    // if we didn't find a pre-request to remove, add it to the pending list so we can remove it later,
+    // this typically happens when we receive a cached response while executing
+    // the async function to add the pre-request
     if (!removed) {
       debugVerbose('No pre-request found to remove, adding to pending list: %s', requestId)
       this.pendingPreRequestsToRemove.add(requestId)
@@ -274,7 +277,7 @@ export class PreRequests {
 
     if (pendingPreRequest) {
       metrics.immediatelyMatchedRequests++
-      ctxDebug('Incoming request %s matches known pre-request: %o', key, pendingPreRequest.browserPreRequest.requestId)
+      ctxDebug('Incoming request %s matches known pre-request: %o', key, pendingPreRequest.browserPreRequest)
 
       callback({
         browserPreRequest: {

packages/server/lib/project-base.ts

@@ -156,7 +156,6 @@ export class ProjectBase extends EE {
     const [port, warning] = await this._server.open(cfg, {
       getCurrentBrowser: () => this.browser,
       getSpec: () => this.spec,
-      exit: this.options.args?.exit,
       onError: this.options.onError,
       onWarning: this.options.onWarning,
       shouldCorrelatePreRequests: this.shouldCorrelatePreRequests,

packages/server/lib/server-base.ts

@@ -133,16 +133,13 @@ export interface OpenServerOptions {
   testingType: Cypress.TestingType
   onError: any
   onWarning: any
-  exit?: boolean
   getCurrentBrowser: () => Browser
   getSpec: () => FoundSpec | null
   shouldCorrelatePreRequests: () => boolean
-  protocolManager?: ProtocolManagerShape
 }
 
 export class ServerBase<TSocket extends SocketE2E | SocketCt> {
   private _middleware
-  private _protocolManager?: ProtocolManagerShape
   protected request: Request
   protected isListening: boolean
   protected socketAllowed: SocketAllowed
@@ -214,8 +211,6 @@ export class ServerBase<TSocket extends SocketE2E | SocketCt> {
   }
 
   setProtocolManager (protocolManager: ProtocolManagerShape | undefined) {
-    this._protocolManager = protocolManager
-
     this._socket?.setProtocolManager(protocolManager)
     this._networkProxy?.setProtocolManager(protocolManager)
   }
@@ -329,8 +324,6 @@ export class ServerBase<TSocket extends SocketE2E | SocketCt> {
     shouldCorrelatePreRequests,
     testingType,
     SocketCtor,
-    exit,
-    protocolManager,
   }: OpenServerOptions) {
     debug('server open')
     this.testingType = testingType
@@ -356,6 +349,7 @@ export class ServerBase<TSocket extends SocketE2E | SocketCt> {
       remoteStates: this._remoteStates,
       resourceTypeAndCredentialManager: this.resourceTypeAndCredentialManager,
       shouldCorrelatePreRequests,
+      getCurrentBrowser,
     })
 
     if (config.experimentalSourceRewriting) {
@@ -443,7 +437,7 @@ export class ServerBase<TSocket extends SocketE2E | SocketCt> {
     return e
   }
 
-  createNetworkProxy ({ config, remoteStates, resourceTypeAndCredentialManager, shouldCorrelatePreRequests }) {
+  createNetworkProxy ({ config, remoteStates, resourceTypeAndCredentialManager, shouldCorrelatePreRequests, getCurrentBrowser }) {
     const getFileServerToken = () => {
       return this._fileServer?.token
     }
@@ -461,6 +455,7 @@ export class ServerBase<TSocket extends SocketE2E | SocketCt> {
       request: this.request,
       serverBus: this._eventBus,
       resourceTypeAndCredentialManager,
+      getCurrentBrowser,
     })
   }