🐛 pr-feedback: renamed workerImplementation

Author: mormubis

test/e2e/lib/framework/createTest.ts

@@ -39,7 +39,6 @@ interface TestContext {
   flushEvents: () => Promise<void>
   deleteAllCookies: () => Promise<void>
   sendXhr: (url: string, headers?: string[][]) => Promise<string>
-  interactWithWorker: (cb: (worker: ServiceWorker) => void) => Promise<void>
 }
 
 type TestRunner = (testContext: TestContext) => Promise<void> | void
@@ -132,9 +131,8 @@ class TestBuilder {
     return this
   }
 
-  withWorker(implementation: WorkerImplementationFactory, options: RegistrationOptions = {}) {
-    implementation.isModule = options.type === 'module'
-    this.workerImplementationFactory = implementation
+  withWorker(implementation: WorkerImplementationFactory['implementation'], options: RegistrationOptions = {}) {
+    this.workerImplementationFactory = { ...options, implementation }
 
     // Service workers require HTTPS or localhost due to browser security restrictions
     this.withHostName('localhost')
@@ -175,7 +173,7 @@ class TestBuilder {
       testFixture: this.testFixture,
       extension: this.extension,
       hostName: this.hostName,
-      workerImplementation: this.workerImplementationFactory,
+      workerImplementationFactory: this.workerImplementationFactory,
     }
 
     if (this.alsoRunWithRumSlim) {
@@ -255,7 +253,7 @@ function declareTest(title: string, setupOptions: SetupOptions, factory: SetupFa
     servers.base.bindServerApp(
       createMockServerApp(servers, setup, {
         remoteConfiguration: setupOptions.remoteConfiguration,
-        workerImplementation: setupOptions.workerImplementation && workerSetup(setupOptions, servers),
+        workerImplementation: setupOptions.workerImplementationFactory && workerSetup(setupOptions, servers),
       })
     )
     servers.crossOrigin.bindServerApp(createMockServerApp(servers, setup))
@@ -299,9 +297,6 @@ function createTestContext(
         browserLogsManager.clear()
       }
     },
-    interactWithWorker: async (cb: (worker: ServiceWorker) => void) => {
-      await page.evaluate(`(${cb.toString()})(window.myServiceWorker.active)`)
-    },
     flushBrowserLogs: () => browserLogsManager.clear(),
     flushEvents: () => flushEvents(page),
     deleteAllCookies: () => deleteAllCookies(browserContext),

test/e2e/lib/framework/pageSetups.ts

@@ -6,9 +6,8 @@ import { DEFAULT_LOGS_CONFIGURATION } from '../helpers/configuration'
 import { isBrowserStack, isContinuousIntegration } from './environment'
 import type { Servers } from './httpServers'
 
-export interface WorkerImplementationFactory {
-  (self: WorkerGlobalScope & { DD_LOGS?: DatadogLogs }): void
-  isModule?: boolean
+export interface WorkerImplementationFactory extends RegistrationOptions {
+  implementation: (self: WorkerGlobalScope & { DD_LOGS?: DatadogLogs }) => void
 }
 export interface SetupOptions {
   rum?: RumInitConfiguration
@@ -31,7 +30,7 @@ export interface SetupOptions {
     logsConfiguration?: LogsInitConfiguration
   }
   hostName?: string
-  workerImplementation?: WorkerImplementationFactory
+  workerImplementationFactory?: WorkerImplementationFactory
 }
 
 export type SetupFactory = (options: SetupOptions, servers: Servers) => string
@@ -212,20 +211,20 @@ export function reactSetup(options: SetupOptions, servers: Servers, appName: str
 export function workerSetup(options: SetupOptions, servers: Servers) {
   let script = ''
 
-  if (!options.workerImplementation) {
+  if (!options.workerImplementationFactory) {
     return script
   }
 
   if (options.logs) {
     script += js`
-      ${options.workerImplementation.isModule ? js`import '/datadog-logs.js';` : js`importScripts('/datadog-logs.js');`}
+      ${options.workerImplementationFactory.type === 'module' ? js`import '/datadog-logs.js';` : js`importScripts('/datadog-logs.js');`}
       
       // Initialize DD_LOGS in service worker
       DD_LOGS.init(${formatConfiguration({ ...DEFAULT_LOGS_CONFIGURATION, ...options.logs }, servers)})
     `
   }
 
-  script += `;(${options.workerImplementation.toString()})(self);`
+  script += `;(${options.workerImplementationFactory.implementation.toString()})(self);`
 
   return script
 }