Set remote session for Testrunner Options (#62)

* Set remote session for Testrunner Options

Signed-off-by: Longfei Wang <longfeiw@amazon.de>

* Patch version update.

Signed-off-by: Longfei Wang <longfeiw@amazon.de>

---------

Signed-off-by: Longfei Wang <longfeiw@amazon.de>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wdio-aws-device-farm-service",
-  "version": "8.0.5",
+  "version": "8.0.6",
   "description": "AWS Device Farm support for WebdriverIO",
   "keywords": [
     "aws",
@@ -93,4 +93,4 @@
   "lint-staged": {
     "*.{json,ts,md}": "prettier --write"
   }
-}
+}

src/__tests__/launcher.test.ts

@@ -22,8 +22,8 @@ describe("DeviceFarmLauncher", () => {
     vi.resetAllMocks();
   });
 
-  it("Updates capabilities with destination", async () => {
-    createTestGridUrlResponse.mockReturnValueOnce({
+  it("Updates capabilities & config with destination", async () => {
+    createTestGridUrlResponse.mockReturnValue({
       url: "https://devicefarm.url/id",
     });
 
@@ -41,6 +41,14 @@ describe("DeviceFarmLauncher", () => {
       browserName: "chrome",
       connectionRetryTimeout: 180000,
     });
+
+    expect(config).toEqual({
+      protocol: "https",
+      hostname: "devicefarm.url",
+      path: "/id",
+      port: 443,
+      connectionRetryTimeout: 180000,
+    });
   });
 
   it("Throws ServereServiceError when create test grid url fails", () => {

src/launcher.ts

@@ -24,7 +24,7 @@ export default class DeviceFarmLauncher implements Services.ServiceInstance {
   }
 
   public async onPrepare(
-    _config: Options.Testrunner,
+    config: Options.Testrunner,
     capabilities: Capabilities.RemoteCapabilities
   ): Promise<void> {
     try {
@@ -35,28 +35,32 @@ export default class DeviceFarmLauncher implements Services.ServiceInstance {
     }
     if (Array.isArray(capabilities)) {
       for (const cap of capabilities) {
-        await this.setCapabilitySession(cap);
+        await this.setRemoteSession(cap);
       }
     } else if (typeof capabilities === "object" && capabilities !== null) {
       for (const cap of Object.values(capabilities)) {
-        await this.setCapabilitySession(cap);
+        await this.setRemoteSession(cap);
       }
     }
+    // Set remote session so that wdio can skip setting up drivers for cross-browser tests.
+    // See: https://github.com/webdriverio/webdriverio/blob/main/packages/wdio-utils/src/node/manager.ts#L63
+    await this.setRemoteSession(config);
   }
 
-  private async setCapabilitySession(
-    capability:
+  private async setRemoteSession(
+    config:
       | Capabilities.DesiredCapabilities
       | Capabilities.W3CCapabilities
       | Options.WebdriverIO
+      | Options.Testrunner
   ) {
     const testGridUrlResult = await this.createSession();
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const url = new URL(testGridUrlResult.url!);
 
     this.logger?.info("Created device farm test grid:", testGridUrlResult);
 
-    Object.assign(capability, {
+    Object.assign(config, {
       protocol: "https",
       port: 443,
       hostname: url.hostname,