Skip to content

Commit d5f3f2c

Browse files
committed
Add edge support to new remote run
1 parent 14ae658 commit d5f3f2c

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

utils.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ def launch_driver(driver_name=settings.DRIVER, desired_capabilities=None):
1313
driver_name : Name of WebDriver to use
1414
desired_capabilities : Desired browser specs
1515
"""
16+
driver = None
1617

1718
try:
1819
driver_cls = getattr(webdriver, driver_name)
@@ -39,11 +40,6 @@ def launch_driver(driver_name=settings.DRIVER, desired_capabilities=None):
3940
# Append "Selenium Bot" to the existing user agent
4041
custom_user_agent = f'{default_user_agent} OSF Selenium Bot'
4142

42-
# NOTE: BrowserStack does support the use of Chrome Options, but we are not
43-
# currently using any of them. Below are several steps to setup preferences
44-
# that are specific to Firefox. Currently when running Chrome or Edge in
45-
# BrowserStack we are running with the default base install options.
46-
4743
from selenium.webdriver.firefox.options import Options
4844

4945
ffo = Options()
@@ -110,9 +106,10 @@ def launch_driver(driver_name=settings.DRIVER, desired_capabilities=None):
110106
desired_capabilities=desired_capabilities,
111107
options=chrome_options,
112108
)
113-
114-
print(driver.execute_script(DESIRED_CAP))
115-
print(driver.execute_script('return navigator.userAgent;'))
109+
elif settings.BUILD == 'edge':
110+
# Use default settings for edge driver
111+
# We can update this once we upgrade to selenium v4
112+
driver = webdriver.Edge()
116113

117114
elif driver_name == 'Chrome' and settings.HEADLESS:
118115
from selenium.webdriver.chrome.options import Options
@@ -156,6 +153,11 @@ def launch_driver(driver_name=settings.DRIVER, desired_capabilities=None):
156153
else:
157154
driver = driver_cls()
158155

156+
if driver is None:
157+
raise RuntimeError(
158+
'WebDriver could not be instantiated based on provided configuration.'
159+
)
160+
159161
driver.maximize_window()
160162
return driver
161163

0 commit comments

Comments
 (0)