fix: pass browserInstance through to execute

example/e2e-multiremote/api.spec.ts

@@ -11,12 +11,12 @@ describe('Electron APIs using Multiremote', () => {
     expect(appVersion).toStrictEqual([version, version]);
   });
 
-  it('should allow to retrieve API values from single instance', async () => {
+  it('should retrieve instance-specific values from a single instance', async () => {
     const browserA = multiremotebrowser.getInstance('browserA');
-    expect(await browserA.electron.execute((electron) => electron.app.getName())).toStrictEqual([name, name]);
-    expect(await browserA.electron.execute((electron) => electron.app.getVersion())).toStrictEqual([version, version]);
+    expect(await browserA.electron.execute(() => process.argv.includes('--browser=A'))).toBe(true);
+    expect(await browserA.electron.execute(() => process.argv.includes('--browser=B'))).toBe(false);
     const browserB = multiremotebrowser.getInstance('browserB');
-    expect(await browserB.electron.execute((electron) => electron.app.getName())).toStrictEqual([name, name]);
-    expect(await browserB.electron.execute((electron) => electron.app.getVersion())).toStrictEqual([version, version]);
+    expect(await browserB.electron.execute(() => process.argv.includes('--browser=A'))).toBe(false);
+    expect(await browserB.electron.execute(() => process.argv.includes('--browser=B'))).toBe(true);
   });
 });

example/wdio.multiremote.conf.ts

@@ -3,16 +3,23 @@ import { config as baseConfig } from './wdio.conf.js';
 
 export const config: Options.Testrunner = {
   ...baseConfig,
+  outputDir: 'wdio-multiremote-logs',
   specs: ['./e2e-multiremote/*.ts'],
   capabilities: {
     browserA: {
       capabilities: {
-        browserName: 'electron',
+        'browserName': 'electron',
+        'wdio:electronServiceOptions': {
+          appArgs: ['browser=A'],
+        },
       },
     },
     browserB: {
       capabilities: {
-        browserName: 'electron',
+        'browserName': 'electron',
+        'wdio:electronServiceOptions': {
+          appArgs: ['browser=B'],
+        },
       },
     },
   },

src/commands/execute.ts

@@ -1,7 +1,5 @@
-import type ElectronWorkerService from '../service.js';
-
 export async function execute<ReturnValue, InnerArguments extends unknown[]>(
-  this: ElectronWorkerService,
+  browser: WebdriverIO.Browser,
   script: string | ((...innerArgs: InnerArguments) => ReturnValue),
   ...args: InnerArguments
 ): Promise<ReturnValue> {
@@ -12,7 +10,6 @@ export async function execute<ReturnValue, InnerArguments extends unknown[]>(
     throw new Error('Expecting script to be type of "string" or "function"');
   }
 
-  const browser = this.browser as WebdriverIO.Browser;
   if (!browser) {
     throw new Error('WDIO browser is not yet initialised');
   }

src/service.ts

@@ -21,10 +21,12 @@ export default class ElectronWorkerService implements Services.ServiceInstance {
     this.#browser = browser;
   }
 
-  #getElectronAPI() {
+  #getElectronAPI(browserInstance?: WebdriverIO.Browser) {
+    const browser = (browserInstance || this.browser) as WebdriverIO.Browser;
     const api = {
       _mocks: {} as Record<string, ElectronServiceMock>,
-      execute: execute.bind(this),
+      execute: (script: string | ((...innerArgs: unknown[]) => unknown), ...args: unknown[]) =>
+        execute.apply(this, [browser, script, ...args]),
       mock: mock.bind(this),
       mockAll: mockAll.bind(this),
       removeMocks: removeMocks.bind(this),
@@ -56,7 +58,8 @@ export default class ElectronWorkerService implements Services.ServiceInstance {
           continue;
         }
         log.debug('Adding Electron API to browser object instance named: ', instance);
-        mrInstance.electron = this.#getElectronAPI();
+
+        mrInstance.electron = this.#getElectronAPI(mrInstance);
       }
     }
   }

test/commands/execute.spec.ts

@@ -1,44 +1,41 @@
 import { vi, describe, beforeEach, it, expect } from 'vitest';
 
 import { execute } from '../../src/commands/execute';
-import ElectronWorkerService from '../../src';
 
 describe('execute', () => {
-  let workerService;
   beforeEach(async () => {
     globalThis.browser = {
       execute: vi.fn(),
     } as unknown as WebdriverIO.Browser;
-    workerService = new ElectronWorkerService({});
-    workerService.browser = globalThis.browser;
   });
 
-  it('should throw an error when called with a parameter of the wrong type', async () => {
-    await expect(() => execute.call(workerService, {})).rejects.toThrowError(
+  it('should throw an error when called with a script argument of the wrong type', async () => {
+    await expect(() => execute(globalThis.browser, {} as string)).rejects.toThrowError(
       new Error('Expecting script to be type of "string" or "function"'),
     );
   });
 
-  it('should throw an error when called without a parameter', async () => {
-    await expect(() => execute.call(workerService)).rejects.toThrowError(
+  it('should throw an error when called without a script argument', async () => {
+    // @ts-expect-error no script argument
+    await expect(() => execute(globalThis.browser)).rejects.toThrowError(
       new Error('Expecting script to be type of "string" or "function"'),
     );
   });
 
   it('should throw an error when the browser is not initialised', async () => {
-    workerService.browser = undefined;
-    await expect(() => execute.call(workerService, 'return 1 + 2 + 3')).rejects.toThrowError(
+    // @ts-expect-error undefined browser argument
+    await expect(() => execute(undefined, 'return 1 + 2 + 3')).rejects.toThrowError(
       new Error('WDIO browser is not yet initialised'),
     );
   });
 
   it('should execute a stringified function', async () => {
-    await execute.call(workerService, 'return 1 + 2 + 3');
+    await execute(globalThis.browser, 'return 1 + 2 + 3');
     expect(globalThis.browser.execute).toHaveBeenCalledWith('return 1 + 2 + 3');
   });
 
   it('should execute a function', async () => {
-    await execute.call(workerService, () => 1 + 2 + 3);
+    await execute(globalThis.browser, () => 1 + 2 + 3);
     expect(globalThis.browser.execute).toHaveBeenCalledWith(expect.any(Function), '() => 1 + 2 + 3');
   });
 });

vitest.config.ts

@@ -1,5 +1,7 @@
 import { configDefaults, defineConfig } from 'vitest/config';
 
+const symlinkedCJSFiles = ['src/cjs/constants.ts', 'src/cjs/main.ts', 'src/cjs/preload.ts', 'src/cjs/types.ts'];
+
 export default defineConfig({
   test: {
     include: ['test/**/*.spec.ts'],
@@ -8,13 +10,12 @@ export default defineConfig({
     coverage: {
       enabled: true,
       include: ['src/**/*'],
-      // exclude symlinked CJS files from coverage
-      exclude: ['src/cjs/constants.ts', 'src/cjs/main.ts', 'src/cjs/preload.ts', 'src/cjs/types.ts'],
+      exclude: [...symlinkedCJSFiles, 'src/types.ts'],
       thresholds: {
-        lines: 75,
-        functions: 75,
-        branches: 75,
-        statements: 75,
+        lines: 70,
+        functions: 70,
+        branches: 70,
+        statements: 70,
       },
     },
   },