Merge pull request #2239 from koddsson/update-webdriver

Update `webdriver` to version 8

Author: koddsson

.changeset/gold-poems-refuse.md

@@ -0,0 +1,6 @@
+---
+'@web/test-runner-saucelabs': minor
+'@web/test-runner-webdriver': minor
+---
+
+Update `webdriver` to version 8

packages/test-runner-saucelabs/package.json

@@ -49,8 +49,8 @@
     "ip": "^1.1.5",
     "nanoid": "^3.1.25",
     "saucelabs": "^7.2.0",
-    "webdriver": "^7.16.0",
-    "webdriverio": "^7.16.0"
+    "webdriver": "^8.8.6",
+    "webdriverio": "^8.8.6"
   },
   "devDependencies": {
     "@types/ip": "^1.1.0",

packages/test-runner-webdriver/package.json

@@ -48,7 +48,7 @@
   ],
   "dependencies": {
     "@web/test-runner-core": "^0.11.0",
-    "webdriverio": "^7.16.0"
+    "webdriverio": "^8.8.6"
   },
   "devDependencies": {
     "@types/selenium-standalone": "^7.0.1",

packages/test-runner-webdriver/src/IFrameManager.ts

@@ -7,7 +7,7 @@ import { validateBrowserResult } from './coverage';
  */
 export class IFrameManager {
   private config: TestRunnerCoreConfig;
-  private driver: Browser<'async'>;
+  private driver: Browser;
   private framePerSession = new Map<string, string>();
   private inactiveFrames: string[] = [];
   private frameCount = 0;
@@ -16,7 +16,7 @@ export class IFrameManager {
   private locked?: Promise<unknown>;
   private isIE: boolean;
 
-  constructor(config: TestRunnerCoreConfig, driver: Browser<'async'>, isIE: boolean) {
+  constructor(config: TestRunnerCoreConfig, driver: Browser, isIE: boolean) {
     this.config = config;
     this.driver = driver;
     this.isIE = isIE;
@@ -169,7 +169,7 @@ export class IFrameManager {
 
     await this.driver.switchToFrame(frame);
 
-    const elementData = (await this.driver.execute(locator, [])) as Element<'async'>;
+    const elementData = (await this.driver.execute(locator, [])) as Element;
 
     const element = await this.driver.$(elementData);
 

packages/test-runner-webdriver/src/SessionManager.ts

@@ -7,12 +7,12 @@ import { validateBrowserResult } from './coverage';
  */
 export class SessionManager {
   private config: TestRunnerCoreConfig;
-  private driver: Browser<'async'>;
+  private driver: Browser;
   private locked?: Promise<unknown>;
   private isIE: boolean;
   private urlMap = new Map<string, string>();
 
-  constructor(config: TestRunnerCoreConfig, driver: Browser<'async'>, isIE: boolean) {
+  constructor(config: TestRunnerCoreConfig, driver: Browser, isIE: boolean) {
     this.config = config;
     this.driver = driver;
     this.isIE = isIE;
@@ -89,7 +89,7 @@ export class SessionManager {
   }
 
   async takeScreenshot(_: string, locator: string): Promise<Buffer> {
-    const elementData = (await this.driver.execute(locator, [])) as Element<'async'>;
+    const elementData = (await this.driver.execute(locator, [])) as Element;
 
     const element = await this.driver.$(elementData);
 

packages/test-runner-webdriver/src/webdriverLauncher.ts

@@ -21,8 +21,8 @@ export class WebdriverLauncher implements BrowserLauncher {
   public name = 'Initializing...';
   public type = 'webdriver';
   private config?: TestRunnerCoreConfig;
-  private driver?: Browser<'async'>;
-  private debugDriver: undefined | Browser<'async'> = undefined;
+  private driver?: Browser;
+  private debugDriver: undefined | Browser = undefined;
   private driverManager?: IFrameManager | SessionManager;
   private __managerPromise?: Promise<IFrameManager | SessionManager>;
   private isIE = false;
@@ -82,7 +82,7 @@ export class WebdriverLauncher implements BrowserLauncher {
     if (this.debugDriver) {
       await this.debugDriver.deleteSession();
     }
-    this.debugDriver = (await remote(this.options)) as Browser<'async'>;
+    this.debugDriver = (await remote(this.options)) as Browser;
     await this.debugDriver.navigateTo(url);
   }
 
@@ -106,7 +106,7 @@ export class WebdriverLauncher implements BrowserLauncher {
     const options: RemoteOptions = { logLevel: 'error', ...this.options };
 
     try {
-      this.driver = (await remote(options)) as Browser<'async'>;
+      this.driver = (await remote(options)) as Browser;
       this.driverManager =
         this.config.concurrency === 1
           ? new SessionManager(this.config, this.driver, this.isIE)