rework

Author: ryanthemanuel

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

@@ -26,7 +26,6 @@ type BrowserCriClientOptions = {
   browserName: string
   onAsynchronousError: (err: CypressError) => void
   protocolManager?: ProtocolManagerShape
-  cyPromptManager?: CyPromptManagerShape
   fullyManageTabs?: boolean
   onServiceWorkerClientEvent: ServiceWorkerEventHandler
 }
@@ -211,7 +210,6 @@ export class BrowserCriClient {
     this.browserName = options.browserName
     this.onAsynchronousError = options.onAsynchronousError
     this.protocolManager = options.protocolManager
-    this.cyPromptManager = options.cyPromptManager
     this.fullyManageTabs = options.fullyManageTabs
     this.onServiceWorkerClientEvent = options.onServiceWorkerClientEvent
   }
@@ -228,7 +226,6 @@ export class BrowserCriClient {
    * @param options.onReconnect callback for when the browser cri client reconnects to the browser
    * @param options.port the port to which to connect
    * @param options.protocolManager the protocol manager to use with the browser cri client
-   * @param options.cyPromptManager the cy.prompt() manager to use with the browser cri client
    * @param options.onServiceWorkerClientEvent callback for when a service worker fetch event is received
    * @returns a wrapper around the chrome remote interface that is connected to the browser target
    */
@@ -241,7 +238,6 @@ export class BrowserCriClient {
       onReconnect,
       port,
       protocolManager,
-      cyPromptManager,
       onServiceWorkerClientEvent,
     } = options
 
@@ -266,7 +262,6 @@ export class BrowserCriClient {
         browserName,
         onAsynchronousError,
         protocolManager,
-        cyPromptManager,
         fullyManageTabs,
         onServiceWorkerClientEvent,
       })
@@ -569,32 +564,14 @@ export class BrowserCriClient {
         browserClient: this.browserClient,
       })
 
-      const currentTarget = this.currentlyAttachedTarget
-
-      const createProtocolTarget = async () => {
-        // Clone the target here so that we separate the protocol client and the main client.
-        // This allows us to close the protocol client independently of the main client
-        // which we do when we exit out of studio in open mode.
-        if (!this.currentlyAttachedProtocolTarget) {
-          this.currentlyAttachedProtocolTarget = await currentTarget.clone()
-        }
-
-        await this.protocolManager?.connectToBrowser(this.currentlyAttachedProtocolTarget)
+      // Clone the target here so that we separate the protocol client and the main client.
+      // This allows us to close the protocol client independently of the main client
+      // which we do when we exit out of studio in open mode.
+      if (!this.currentlyAttachedProtocolTarget) {
+        this.currentlyAttachedProtocolTarget = await this.currentlyAttachedTarget.clone()
       }
 
-      const createCyPromptTarget = async () => {
-        // Clone the cy.prompt() target here so that we separate the cy.prompt() client and the main client.
-        if (!this.currentlyAttachedCyPromptTarget) {
-          this.currentlyAttachedCyPromptTarget = await currentTarget.clone()
-        }
-
-        await this.cyPromptManager?.connectToBrowser(this.currentlyAttachedCyPromptTarget)
-      }
-
-      await Promise.all([
-        createProtocolTarget(),
-        createCyPromptTarget(),
-      ])
+      await this.protocolManager?.connectToBrowser(this.currentlyAttachedProtocolTarget)
 
       return this.currentlyAttachedTarget
     }, this.browserName, this.port)

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

@@ -60,14 +60,14 @@ describe('lib/browsers/browser-cri-client', function () {
       'chrome-remote-interface': criImport,
     })
 
-    getClient = ({ protocolManager, cyPromptManager, fullyManageTabs } = {}) => {
+    getClient = ({ protocolManager, fullyManageTabs } = {}) => {
       criClientCreateStub = criClientCreateStub.withArgs({ target: 'http://web/socket/url', onAsynchronousError: onError, onReconnect: undefined, protocolManager, fullyManageTabs }).resolves({
         send,
         on,
         close,
       })
 
-      return browserCriClient.BrowserCriClient.create({ hosts: ['127.0.0.1'], port: PORT, browserName: 'Chrome', onAsynchronousError: onError, protocolManager, cyPromptManager, fullyManageTabs, onServiceWorkerClientEvent })
+      return browserCriClient.BrowserCriClient.create({ hosts: ['127.0.0.1'], port: PORT, browserName: 'Chrome', onAsynchronousError: onError, protocolManager, fullyManageTabs, onServiceWorkerClientEvent })
     }
   })
 
@@ -455,9 +455,8 @@ describe('lib/browsers/browser-cri-client', function () {
   context('#attachToTargetUrl', function () {
     it('creates a page client when the passed in url is found', async function () {
       const mockProtocolClient = {}
-      const mockCyPromptClient = {}
       const mockPageClient = {
-        clone: sinon.stub().onFirstCall().returns(mockProtocolClient).onSecondCall().returns(mockCyPromptClient),
+        clone: sinon.stub().onFirstCall().returns(mockProtocolClient),
       }
 
       send.withArgs('Target.getTargets').resolves({ targetInfos: [{ targetId: '1', url: 'http://foo.com' }, { targetId: '2', url: 'http://bar.com' }] })
@@ -469,50 +468,39 @@ describe('lib/browsers/browser-cri-client', function () {
 
       expect(client).to.be.equal(mockPageClient)
       expect(browserClient.currentlyAttachedProtocolTarget).to.be.equal(mockProtocolClient)
-      expect(browserClient.currentlyAttachedCyPromptTarget).to.be.equal(mockCyPromptClient)
     })
 
     it('creates a page client when the passed in url is found and notifies the protocol manager and fully managed tabs', async function () {
       const mockProtocolClient = {}
-      const mockCyPromptClient = {}
       const mockPageClient = {
-        clone: sinon.stub().onFirstCall().returns(mockProtocolClient).onSecondCall().returns(mockCyPromptClient),
+        clone: sinon.stub().onFirstCall().returns(mockProtocolClient),
       }
       const protocolManager: any = {
         connectToBrowser: sinon.stub().resolves(),
       }
-      const cyPromptManager: any = {
-        connectToBrowser: sinon.stub().resolves(),
-      }
 
       send.withArgs('Target.getTargets').resolves({ targetInfos: [{ targetId: '1', url: 'http://foo.com' }, { targetId: '2', url: 'http://bar.com' }] })
       send.withArgs('Target.setDiscoverTargets', { discover: true })
       on.withArgs('Target.targetDestroyed', sinon.match.func)
       criClientCreateStub.withArgs({ target: '1', onAsynchronousError: onError, host: HOST, port: PORT, protocolManager, fullyManageTabs: true, browserClient: { on, send, close } }).resolves(mockPageClient)
 
-      const browserClient = await getClient({ protocolManager, cyPromptManager, fullyManageTabs: true })
+      const browserClient = await getClient({ protocolManager, fullyManageTabs: true })
 
       const client = await browserClient.attachToTargetUrl('http://foo.com')
 
       expect(client).to.be.equal(mockPageClient)
       expect(browserClient.currentlyAttachedProtocolTarget).to.be.equal(mockProtocolClient)
-      expect(browserClient.currentlyAttachedCyPromptTarget).to.be.equal(mockCyPromptClient)
       expect(protocolManager.connectToBrowser).to.be.calledWith(browserClient.currentlyAttachedProtocolTarget)
-      expect(cyPromptManager.connectToBrowser).to.be.calledWith(browserClient.currentlyAttachedCyPromptTarget)
     })
 
     it('creates a page client when the passed in url is found and notifies the protocol manager and fully managed tabs and attaching to target throws', async function () {
       const mockProtocolClient = {}
-      const mockCyPromptClient = {}
       const mockPageClient = {
-        clone: sinon.stub().onFirstCall().returns(mockProtocolClient).onSecondCall().returns(mockCyPromptClient),
+        clone: sinon.stub().onFirstCall().returns(mockProtocolClient),
       }
       const protocolManager: any = {
         connectToBrowser: sinon.stub().resolves(),
       }
-      const cyPromptManager: any = {
-        connectToBrowser: sinon.stub().resolves(),
-      }
 
       send.withArgs('Target.getTargets').resolves({ targetInfos: [{ targetId: '1', url: 'http://foo.com' }, { targetId: '2', url: 'http://bar.com' }] })
       send.withArgs('Target.setDiscoverTargets', { discover: true })
@@ -522,15 +510,13 @@ describe('lib/browsers/browser-cri-client', function () {
 
       criClientCreateStub.withArgs({ target: '1', onAsynchronousError: onError, host: HOST, port: PORT, protocolManager, fullyManageTabs: true, browserClient: { on, send, close } }).resolves(mockPageClient)
 
-      const browserClient = await getClient({ protocolManager, cyPromptManager, fullyManageTabs: true })
+      const browserClient = await getClient({ protocolManager, fullyManageTabs: true })
 
       const client = await browserClient.attachToTargetUrl('http://foo.com')
 
       expect(client).to.be.equal(mockPageClient)
       expect(browserClient.currentlyAttachedProtocolTarget).to.be.equal(mockProtocolClient)
-      expect(browserClient.currentlyAttachedCyPromptTarget).to.be.equal(mockCyPromptClient)
       expect(protocolManager.connectToBrowser).to.be.calledWith(browserClient.currentlyAttachedProtocolTarget)
-      expect(cyPromptManager.connectToBrowser).to.be.calledWith(browserClient.currentlyAttachedCyPromptTarget)
 
       // This would throw if the error was not caught
       await on.withArgs('Target.attachedToTarget').args[0][1]({ targetInfo: { type: 'worker' } })