diff --git a/py/conftest.py b/py/conftest.py index 7874ccc3f7b9c..93011b7785c6b 100644 --- a/py/conftest.py +++ b/py/conftest.py @@ -81,8 +81,8 @@ def driver(request): # skip tests if not available on the platform _platform = platform.system() if driver_class == "Safari" and _platform != "Darwin": - pytest.skip("Safari tests can only run on an Apple OS") - if (driver_class == "Ie" or driver_class == "Edge") and _platform != "Windows": + pytest.skip("Safari tests can only rn on an Apple OS") + if (driver_class == "Ie") and _platform != "Windows": pytest.skip("IE and EdgeHTML Tests can only run on Windows") if "WebKit" in driver_class and _platform != "Linux": pytest.skip("Webkit tests can only run on Linux") diff --git a/py/selenium/webdriver/edge/options.py b/py/selenium/webdriver/edge/options.py index 774a66ecbb17a..3a617eea81119 100644 --- a/py/selenium/webdriver/edge/options.py +++ b/py/selenium/webdriver/edge/options.py @@ -24,7 +24,7 @@ class Options(ChromiumOptions): def __init__(self): super(Options, self).__init__() - self._use_chromium = False + self._use_chromium = True self._use_webview = False @property diff --git a/py/selenium/webdriver/edge/webdriver.py b/py/selenium/webdriver/edge/webdriver.py index 5241966be3a7b..333f4ac1d5278 100644 --- a/py/selenium/webdriver/edge/webdriver.py +++ b/py/selenium/webdriver/edge/webdriver.py @@ -33,8 +33,8 @@ class WebDriver(ChromiumDriver): https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/ """ - def __init__(self, executable_path='MicrosoftWebDriver.exe', port=DEFAULT_PORT, - options: Options = None, service_args=None, + def __init__(self, executable_path='msedgedriver', port=DEFAULT_PORT, + options: Options = Options(), service_args=None, capabilities=None, service_log_path=DEFAULT_SERVICE_LOG_PATH, service: Service = None, keep_alive=False, verbose=False): """ @@ -52,7 +52,7 @@ def __init__(self, executable_path='MicrosoftWebDriver.exe', port=DEFAULT_PORT, - keep_alive - Whether to configure EdgeRemoteConnection to use HTTP keep-alive. - verbose - whether to set verbose logging in the service. """ - if executable_path != 'MicrosoftWebDriver.exe': + if executable_path != 'msedgedriver': warnings.warn('executable_path has been deprecated, please pass in a Service object', DeprecationWarning, stacklevel=2)