chore: adding support for page:loading event (#26779)

cypress-io · May 18, 2023 · 569197c · 569197c · cypress-bot · May 18, 2023
1 parent 4a15e83
commit 569197c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 0 deletions.
diff --git a/packages/app/src/runner/events/capture-protocol.ts b/packages/app/src/runner/events/capture-protocol.ts
@@ -46,4 +46,10 @@ export const addCaptureProtocolListeners = (Cypress: Cypress.Cypress) => {
 
     Cypress.backend('protocol:url:changed', { url, timestamp })
   })
+
+  Cypress.on('page:loading', (loading) => {
+    const timestamp = performance.timeOrigin + performance.now()
+
+    Cypress.backend('protocol:page:loading', { loading, timestamp })
+  })
 }
diff --git a/packages/driver/types/internal-types-lite.d.ts b/packages/driver/types/internal-types-lite.d.ts
@@ -19,6 +19,7 @@ declare namespace Cypress {
     (action: 'before:screenshot', fn: (config: {}, fn: () => void) => void)
     (action: 'after:screenshot', config: {})
     (action: 'command:failed', fn: (command: CommandQueue, error: Error) => void): Cypress
+    (action: 'page:loading', fn: (loading: boolean) => void)
   }
 
   interface Backend {
@@ -28,6 +29,7 @@ declare namespace Cypress {
     (task: 'protocol:test:before:run:async', attributes: any): Promise<void>
     (task: 'protocol:test:after:run', attributes: any): Promise<void>
     (task: 'protocol:url:changed', input: any): Promise<void>
+    (task: 'protocol:page:loading', input: any): Promise<void>
   }
 
   interface cy {

diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts
@@ -154,6 +154,10 @@ export class ProtocolManager implements ProtocolManagerShape {
     this.invokeSync('urlChanged', input)
   }
 
+  pageLoading (input: any): void {
+    this.invokeSync('pageLoading', input)
+  }
+
   async uploadCaptureArtifact (uploadUrl: string) {
     const dbPath = this._dbPath
 

diff --git a/packages/server/lib/socket-base.ts b/packages/server/lib/socket-base.ts
@@ -470,6 +470,8 @@ export class SocketBase {
               return this.protocolManager?.viewportChanged(args[0])
             case 'protocol:url:changed':
               return this.protocolManager?.urlChanged(args[0])
+            case 'protocol:page:loading':
+              return this.protocolManager?.pageLoading(args[0])
             case 'telemetry':
               return (telemetry.exporter() as OTLPTraceExporterCloud)?.send(args[0], () => {}, (err) => {
                 debug('error exporting telemetry data from browser %s', err)

diff --git a/packages/server/test/support/fixtures/cloud/protocol/test-protocol.ts b/packages/server/test/support/fixtures/cloud/protocol/test-protocol.ts
@@ -31,6 +31,7 @@ export class AppCaptureProtocol implements ProtocolManagerShape {
   commandLogChanged = (log) => {}
   viewportChanged = (input) => {}
   urlChanged = (input) => {}
+  pageLoading = (input) => {}
   sendErrors (errors) {
     return Promise.resolve()
   }

diff --git a/packages/server/test/unit/cloud/protocol_spec.ts b/packages/server/test/unit/cloud/protocol_spec.ts
@@ -235,4 +235,17 @@ describe('lib/cloud/protocol', () => {
 
     expect(protocol.urlChanged).to.be.calledWith(input)
   })
+
+  it('should be able to handle the page loading', () => {
+    sinon.stub(protocol, 'pageLoading')
+
+    const input = {
+      loading: true,
+      timestamp: 1234,
+    }
+
+    protocolManager.pageLoading(input)
+
+    expect(protocol.pageLoading).to.be.calledWith(input)
+  })
 })
diff --git a/packages/types/src/protocol.ts b/packages/types/src/protocol.ts
@@ -23,6 +23,7 @@ export interface AppCaptureProtocolCommon {
   afterTest(test: Record<string, any>): void
   afterSpec (): Promise<void>
   connectToBrowser (cdpClient: CDPClient): Promise<void>
+  pageLoading (input: any): void
 }
 
 export interface AppCaptureProtocolInterface extends AppCaptureProtocolCommon {

diff --git a/system-tests/lib/protocolStub.ts b/system-tests/lib/protocolStub.ts
@@ -31,6 +31,7 @@ export class AppCaptureProtocol implements ProtocolManagerShape {
   commandLogChanged = (log) => {}
   viewportChanged = (input) => {}
   urlChanged = (input) => {}
+  pageLoading = (input) => {}
   sendErrors (errors) {
     return Promise.resolve()
   }