Moves bidi check into useragentToBrowserObject

mrhenry · Oct 10, 2024 · 87763b7 · 87763b7
1 parent 64c86a7
commit 87763b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/test/polyfills/remotetest.js b/test/polyfills/remotetest.js
@@ -140,6 +140,11 @@ async function main() {
 						seleniumVersion: "3.5.2"
 					};
 				}
+				if (o.browserName === 'chrome' && ['87.0', '88.0', '89.0', '90.0'].includes(o.browserVersion)) {
+					// Chrome versions 87-90 act like they support BiDi, but they don't
+					// TODO: remove this check if BrowserStack or WebDriverIO fixes this
+					o["wdio:enforceWebDriverClassic"] = true;
+				}
 				return o;
 			}
 		}

diff --git a/test/polyfills/test-job.js b/test/polyfills/test-job.js
@@ -30,12 +30,6 @@ module.exports = class TestJob {
 		this.results = undefined;
 		this.lastUpdateTime = 0;
 		this.duration = 0;
-
-		// Chrome versions 87-90 act like they support BiDi, but they don't
-		// TODO: remove this check if BrowserStack or WebDriverIO fixes this
-		const skipBiDi = capability.browserName === 'chrome' &&
-			['87.0', '88.0', '89.0', '90.0'].includes(capability.browserVersion);
-
 		// BrowserStack options https://www.browserstack.com/automate/capabilities
 		this.capabilities = _.merge(
 			{
@@ -47,8 +41,7 @@ module.exports = class TestJob {
 					debug: true,
 					consoleLogs: "errors",
 					networkLogs: true
-				},
-				...(skipBiDi && { "wdio:enforceWebDriverClassic": true })
+				}
 			},
 			capability
 		);