misc: Close extra tabs/windows between tests

cli/CHANGELOG.md

@@ -9,6 +9,10 @@ _Released 11/7/2023 (PENDING)_
 - Fixed an issue where network requests made from tabs/windows other than the main Cypress tab would be delayed. Fixes [#28113](https://github.com/cypress-io/cypress/issues/28113).
 - Stopped processing CDP events at the end of a spec when Test Isolation is off and Test Replay is enabled. Addressed in [#28213](https://github.com/cypress-io/cypress/pull/28213).
 
+**Misc:**
+
+- Browser tabs and windows other than the Cypress tab are now closed between tests. Addressed in [#28204](https://github.com/cypress-io/cypress/pull/28204).
+
 ## 13.4.0
 
 _Released 10/30/2023_

packages/driver/src/cypress/cy.ts

@@ -338,6 +338,11 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
       this.enqueue($Command.create(attrs))
     })
 
+    // clears out any extra tabs/windows between tests
+    Cypress.on('test:before:run:async', () => {
+      return Cypress.backend('close:extra:targets')
+    })
+
     handleCrossOriginCookies(Cypress)
   }
 

packages/server/lib/browsers/browser-cri-client.ts

@@ -573,6 +573,18 @@ export class BrowserCriClient {
     this.extraTargetClients.delete(targetId)
   }
 
+  async closeExtraTargets () {
+    for (const [targetId] of this.extraTargetClients) {
+      debug('Close extra target (id: %s)', targetId)
+
+      try {
+        await this.browserClient.send('Target.closeTarget', { targetId })
+      } catch (err: any) {
+        debug('Closing extra target errored: %s', err?.stack || err)
+      }
+    }
+  }
+
   /**
    * Closes the browser client socket as well as the socket for the currently attached page target
    */

packages/server/lib/browsers/chrome.ts

@@ -637,4 +637,8 @@ export = {
     // with additional method to close the remote connection
     return launchedBrowser
   },
+
+  async closeExtraTargets () {
+    return browserCriClient?.closeExtraTargets()
+  },
 }

packages/server/lib/browsers/electron.ts

@@ -535,4 +535,8 @@ export = {
 
     return instance
   },
+
+  async closeExtraTargets () {
+    return browserCriClient?.closeExtraTargets()
+  },
 }

packages/server/lib/browsers/firefox.ts

@@ -579,3 +579,7 @@ export async function open (browser: Browser, url: string, options: BrowserLaunc
 
   return browserInstance
 }
+
+export async function closeExtraTargets () {
+  debug('Closing extra targets is not currently supported in Firefox')
+}

packages/server/lib/browsers/index.ts

@@ -273,4 +273,15 @@ export = {
 
     return instance
   },
+
+  /**
+   * Closes extra targets that are not the Cypress tab
+   */
+  async closeExtraTargets () {
+    if (!instance || !instance.browser) return
+
+    const browserLauncher = await getBrowserLauncher(instance.browser, [])
+
+    await browserLauncher.closeExtraTargets()
+  },
 } as const

packages/server/lib/browsers/types.ts

@@ -44,6 +44,10 @@ export type BrowserLauncher = {
    * Used to connect the protocol to an existing browser.
    */
   connectProtocolToBrowser: (options: { protocolManager?: ProtocolManagerShape }) => Promise<void>
+  /**
+   * Closes any targets that are not the currently-attached Cypress target
+   */
+  closeExtraTargets: () => Promise<void>
 }
 
 export type GracefulShutdownOptions = {

packages/server/lib/browsers/webkit.ts

@@ -149,3 +149,7 @@ export async function open (browser: Browser, url: string, options: BrowserLaunc
 
   return new WkInstance()
 }
+
+export async function closeExtraTargets () {
+  debug('Closing extra targets is not currently supported in Webkit')
+}

packages/server/lib/project-base.ts

@@ -349,6 +349,7 @@ export class ProjectBase extends EE {
       onFocusTests: options.onFocusTests,
       onSpecChanged: options.onSpecChanged,
       onSavedStateChanged: (state: any) => this.saveState(state),
+      closeExtraTargets: this.closeExtraTargets,
 
       onCaptureVideoFrames: (data: any) => {
         // TODO: move this to browser automation middleware
@@ -417,6 +418,10 @@ export class ProjectBase extends EE {
     return this.server.socket.resetBrowserState()
   }
 
+  closeExtraTargets () {
+    return browsers.closeExtraTargets()
+  }
+
   isRunnerSocketConnected () {
     return this.server.socket.isRunnerSocketConnected()
   }

packages/server/lib/socket-base.ts

@@ -145,7 +145,7 @@ export class SocketBase {
       onSpecChanged () {},
       onChromiumRun () {},
       onReloadBrowser () {},
-      checkForAppErrors () {},
+      closeExtraTargets () {},
       onSavedStateChanged () {},
       onTestFileChange () {},
       onCaptureVideoFrames () {},
@@ -478,6 +478,8 @@ export class SocketBase {
                 return (telemetry.exporter() as OTLPTraceExporterCloud)?.send(args[0], () => {}, (err) => {
                   debug('error exporting telemetry data from browser %s', err)
                 })
+              case 'close:extra:targets':
+                return options.closeExtraTargets()
               default:
                 throw new Error(`You requested a backend event we cannot handle: ${eventName}`)
             }

packages/server/test/unit/browsers/browser-cri-client_spec.ts

@@ -361,7 +361,7 @@ describe('lib/browsers/cri-client', function () {
         BrowserCriClient._onTargetDestroyed(options as any)
 
         expect(options.browserCriClient.removeExtraTargetClient).to.be.calledWith('target-id')
-      // error is caught or else the test would fail
+        // error is caught or else the test would fail
       })
 
       it('removes the extra target client from the tracker', () => {
@@ -546,6 +546,38 @@ describe('lib/browsers/cri-client', function () {
     })
   })
 
+  context('#closeExtraTargets', () => {
+    it('closes any extra tracked targets', async () => {
+      const browserClient = await getClient() as any
+
+      browserClient.browserClient.send = sinon.stub().resolves()
+
+      browserClient.addExtraTargetClient({ targetId: 'target-id-1' }, {})
+      browserClient.addExtraTargetClient({ targetId: 'target-id-2' }, {})
+
+      await browserClient.closeExtraTargets()
+
+      expect(browserClient.browserClient.send).to.be.calledWith('Target.closeTarget', { targetId: 'target-id-1' })
+      expect(browserClient.browserClient.send).to.be.calledWith('Target.closeTarget', { targetId: 'target-id-2' })
+    })
+
+    it('ignores errors', async () => {
+      const browserClient = await getClient() as any
+
+      browserClient.browserClient.send = sinon.stub().resolves()
+      browserClient.browserClient.send.onFirstCall().rejects(new Error('failed to close target'))
+
+      browserClient.addExtraTargetClient({ targetId: 'target-id-1' }, {})
+      browserClient.addExtraTargetClient({ targetId: 'target-id-2' }, {})
+
+      await browserClient.closeExtraTargets()
+
+      expect(browserClient.browserClient.send).to.be.calledWith('Target.closeTarget', { targetId: 'target-id-1' })
+      expect(browserClient.browserClient.send).to.be.calledWith('Target.closeTarget', { targetId: 'target-id-2' })
+      // error is caught or else the test would fail
+    })
+  })
+
   context('#close', function () {
     it('closes the currently attached target if it exists and the browser client', async function () {
       const mockCurrentlyAttachedTarget = {