wip

Author: silesky

packages/signals/signals-integration-tests/src/helpers/base-page-object.ts

@@ -31,6 +31,7 @@ export class BasePage {
    */
   async loadAndWait(...args: Parameters<BasePage['load']>) {
     await Promise.all([this.load(...args), this.waitForSettings()])
+    return this
   }
 
   /**
@@ -48,8 +49,12 @@ export class BasePage {
     this.edgeFn = edgeFn
     await this.setupMockedRoutes()
     const url = options.updateURL ? options.updateURL(this.url) : this.url
-    await this.page.goto(url)
-    void this.invokeAnalyticsLoad(signalSettings)
+    await this.page.goto(url, { waitUntil: 'domcontentloaded' })
+    void this.invokeAnalyticsLoad({
+      ...signalSettings,
+      flushInterval: 500,
+    })
+    return this
   }
 
   /**

packages/signals/signals-integration-tests/src/tests/signals-vanilla/basic.test.ts

@@ -1,8 +1,6 @@
 import { test, expect } from '@playwright/test'
 import { IndexPage } from './index-page'
 
-const indexPage = new IndexPage()
-
 const basicEdgeFn = `
     // this is a process signal function
     const processSignal = (signal) => {
@@ -12,8 +10,10 @@ const basicEdgeFn = `
       }
   }`
 
+let indexPage: IndexPage
+
 test.beforeEach(async ({ page }) => {
-  await indexPage.loadAndWait(page, basicEdgeFn)
+  indexPage = await new IndexPage().loadAndWait(page, basicEdgeFn)
 })
 
 test('network signals fetch', async () => {

packages/signals/signals-integration-tests/src/tests/signals-vanilla/button-click-complex.test.ts

@@ -1,12 +1,10 @@
 import { test, expect } from '@playwright/test'
 import { IndexPage } from './index-page'
 
-const indexPage = new IndexPage()
-
 const basicEdgeFn = `const processSignal = (signal) => {}`
-
+let indexPage: IndexPage
 test.beforeEach(async ({ page }) => {
-  await indexPage.loadAndWait(page, basicEdgeFn)
+  indexPage = await new IndexPage().loadAndWait(page, basicEdgeFn)
 })
 
 const data = {

packages/signals/signals-integration-tests/src/tests/signals-vanilla/change-input.test.ts

@@ -2,8 +2,6 @@ import { test, expect } from '@playwright/test'
 import { waitForCondition } from '../../helpers/playwright-utils'
 import { IndexPage } from './index-page'
 
-const indexPage = new IndexPage()
-
 const basicEdgeFn = `const processSignal = (signal) => {}`
 
 test('Collecting signals whenever a user enters text input', async ({
@@ -12,7 +10,7 @@ test('Collecting signals whenever a user enters text input', async ({
   /**
    * Input some text into the input field, see if the signal is emitted correctly
    */
-  await indexPage.loadAndWait(page, basicEdgeFn, {
+  const indexPage = await new IndexPage().loadAndWait(page, basicEdgeFn, {
     disableSignalsRedaction: true,
   })
 

packages/signals/signals-integration-tests/src/tests/signals-vanilla/network-signals-allow-list.test.ts

@@ -1,12 +1,10 @@
 import { test, expect } from '@playwright/test'
 import { IndexPage } from './index-page'
 
-const indexPage = new IndexPage()
-
 const basicEdgeFn = `const processSignal = (signal) => {}`
 
 test('network signals allow and disallow list', async ({ page }) => {
-  await indexPage.loadAndWait(page, basicEdgeFn, {
+  const indexPage = await new IndexPage().loadAndWait(page, basicEdgeFn, {
     networkSignalsAllowList: ['allowed-api.com'],
     networkSignalsDisallowList: ['https://disallowed-api.com/api/foo'],
   })

packages/signals/signals-integration-tests/src/tests/signals-vanilla/network-signals-fetch.test.ts

@@ -7,8 +7,7 @@ test.describe('network signals - fetch', () => {
   let indexPage: IndexPage
 
   test.beforeEach(async ({ page }) => {
-    indexPage = new IndexPage()
-    await indexPage.loadAndWait(page, basicEdgeFn)
+    indexPage = await new IndexPage().loadAndWait(page, basicEdgeFn)
   })
 
   test('should not emit anything if neither request nor response are json', async () => {

packages/signals/signals-integration-tests/src/tests/signals-vanilla/network-signals-xhr.test.ts

@@ -7,8 +7,7 @@ test.describe('network signals - XHR', () => {
   let indexPage: IndexPage
 
   test.beforeEach(async ({ page }) => {
-    indexPage = new IndexPage()
-    await indexPage.loadAndWait(page, basicEdgeFn)
+    indexPage = await new IndexPage().loadAndWait(page, basicEdgeFn)
   })
   test('should not emit anything if neither request nor response are json', async () => {
     await indexPage.network.mockTestRoute('http://localhost/test', {

packages/signals/signals-integration-tests/src/tests/signals-vanilla/signals-redaction.test.ts

@@ -2,14 +2,12 @@ import { test, expect } from '@playwright/test'
 import { waitForCondition } from '../../helpers/playwright-utils'
 import { IndexPage } from './index-page'
 
-const indexPage = new IndexPage()
-
 const basicEdgeFn = `const processSignal = (signal) => {}`
 
 test('redaction enabled -> will XXX the value of text input', async ({
   page,
 }) => {
-  await indexPage.loadAndWait(page, basicEdgeFn, {
+  const indexPage = await new IndexPage().loadAndWait(page, basicEdgeFn, {
     disableSignalsRedaction: false,
   })
 
@@ -38,10 +36,9 @@ test('redaction enabled -> will XXX the value of text input', async ({
 test('redation disabled -> will not touch the value of text input', async ({
   page,
 }) => {
-  await indexPage.loadAndWait(page, basicEdgeFn, {
+  const indexPage = await new IndexPage().loadAndWait(page, basicEdgeFn, {
     disableSignalsRedaction: true,
   })
-
   await Promise.all([
     indexPage.fillNameInput('John Doe'),
     indexPage.waitForSignalsApiFlush(),