Merge branch 'trunk' into PEP-484/webdriver_common_action_builder

iampopovich · web-flow · commit 03b326e66197 · 2021-12-20T21:56:06.000+03:00
diff --git a/py/selenium/webdriver/chrome/service.py b/py/selenium/webdriver/chrome/service.py
@@ -19,15 +19,15 @@
 from selenium.webdriver.chromium import service
 
 
-DEFAULT_EXECUTEABLE_PATH = "chromedriver"
+DEFAULT_EXECUTABLE_PATH = "chromedriver"
 
 
 class Service(service.ChromiumService):
     """
     Object that manages the starting and stopping of the ChromeDriver
     """
 
-    def __init__(self, executable_path: str = DEFAULT_EXECUTEABLE_PATH,
+    def __init__(self, executable_path: str = DEFAULT_EXECUTABLE_PATH,
                  port: int = 0, service_args: List[str] = None,
                  log_path: str = None, env: dict = None):
         """
diff --git a/py/selenium/webdriver/chrome/webdriver.py b/py/selenium/webdriver/chrome/webdriver.py
@@ -17,7 +17,7 @@
 import warnings
 from selenium.webdriver.chromium.webdriver import ChromiumDriver
 from .options import Options
-from .service import DEFAULT_EXECUTEABLE_PATH, Service
+from .service import DEFAULT_EXECUTABLE_PATH, Service
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 
 
@@ -33,7 +33,7 @@ class WebDriver(ChromiumDriver):
     http://chromedriver.storage.googleapis.com/index.html
     """
 
-    def __init__(self, executable_path=DEFAULT_EXECUTEABLE_PATH, port=DEFAULT_PORT,
+    def __init__(self, executable_path=DEFAULT_EXECUTABLE_PATH, port=DEFAULT_PORT,
                  options: Options = None, service_args=None,
                  desired_capabilities=None, service_log_path=DEFAULT_SERVICE_LOG_PATH,
                  chrome_options=None, service: Service = None, keep_alive=DEFAULT_KEEP_ALIVE):
diff --git a/py/selenium/webdriver/edge/service.py b/py/selenium/webdriver/edge/service.py
@@ -19,12 +19,12 @@
 from selenium.webdriver.chromium import service
 
 
-DEFAULT_EXECUTEABLE_PATH = 'msedgedriver'
+DEFAULT_EXECUTABLE_PATH = 'msedgedriver'
 
 
 class Service(service.ChromiumService):
 
-    def __init__(self, executable_path: str = DEFAULT_EXECUTEABLE_PATH,
+    def __init__(self, executable_path: str = DEFAULT_EXECUTABLE_PATH,
                  port: int = 0, verbose: bool = False, log_path: str = None,
                  service_args: List[str] = None, env=None):
         """
diff --git a/py/selenium/webdriver/edge/webdriver.py b/py/selenium/webdriver/edge/webdriver.py
@@ -17,7 +17,7 @@
 import warnings
 from selenium.webdriver.chromium.webdriver import ChromiumDriver
 from .options import Options
-from .service import DEFAULT_EXECUTEABLE_PATH, Service
+from .service import DEFAULT_EXECUTABLE_PATH, Service
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 
 
@@ -32,7 +32,7 @@ class WebDriver(ChromiumDriver):
     https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/
     """
 
-    def __init__(self, executable_path=DEFAULT_EXECUTEABLE_PATH, port=DEFAULT_PORT,
+    def __init__(self, executable_path=DEFAULT_EXECUTABLE_PATH, 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):
diff --git a/py/selenium/webdriver/ie/service.py b/py/selenium/webdriver/ie/service.py
@@ -20,15 +20,15 @@
 from selenium.webdriver.common import service
 
 
-DEFAULT_EXECUTEABLE_PATH = 'IEDriverServer.exe'
+DEFAULT_EXECUTABLE_PATH = 'IEDriverServer.exe'
 
 
 class Service(service.Service):
     """
     Object that manages the starting and stopping of the IEDriver
     """
 
-    def __init__(self, executable_path: str = DEFAULT_EXECUTEABLE_PATH,
+    def __init__(self, executable_path: str = DEFAULT_EXECUTABLE_PATH,
                  port: int = 0, host: str = None,
                  log_level: str = None, log_file: str = None):
         """
diff --git a/py/selenium/webdriver/ie/webdriver.py b/py/selenium/webdriver/ie/webdriver.py
@@ -19,7 +19,7 @@
 import warnings
 
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
-from .service import DEFAULT_EXECUTEABLE_PATH, Service
+from .service import DEFAULT_EXECUTABLE_PATH, Service
 from .options import Options
 from selenium.webdriver.common import utils
 
@@ -34,7 +34,7 @@
 class WebDriver(RemoteWebDriver):
     """ Controls the IEServerDriver and allows you to drive Internet Explorer """
 
-    def __init__(self, executable_path=DEFAULT_EXECUTEABLE_PATH, capabilities=None,
+    def __init__(self, executable_path=DEFAULT_EXECUTABLE_PATH, capabilities=None,
                  port=DEFAULT_PORT, timeout=DEFAULT_TIMEOUT, host=DEFAULT_HOST,
                  log_level=DEFAULT_LOG_LEVEL, service_log_path=DEFAULT_SERVICE_LOG_PATH,
                  options: Options = None, service: Service = None,
diff --git a/py/selenium/webdriver/wpewebkit/service.py b/py/selenium/webdriver/wpewebkit/service.py
@@ -18,15 +18,15 @@
 from selenium.webdriver.common import service
 
 
-DEFAULT_EXECUTEABLE_PATH = "WPEWebDriver"
+DEFAULT_EXECUTABLE_PATH = "WPEWebDriver"
 
 
 class Service(service.Service):
     """
     Object that manages the starting and stopping of the WPEWebKitDriver
     """
 
-    def __init__(self, executable_path: str = DEFAULT_EXECUTEABLE_PATH,
+    def __init__(self, executable_path: str = DEFAULT_EXECUTABLE_PATH,
                  port=0, log_path=None):
         """
         Creates a new instance of the Service
diff --git a/py/selenium/webdriver/wpewebkit/webdriver.py b/py/selenium/webdriver/wpewebkit/webdriver.py
@@ -20,15 +20,15 @@
 
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
-from .service import DEFAULT_EXECUTEABLE_PATH, Service
+from .service import DEFAULT_EXECUTABLE_PATH, Service
 
 
 class WebDriver(RemoteWebDriver):
     """
     Controls the WPEWebKitDriver and allows you to drive the browser.
     """
 
-    def __init__(self, executable_path=DEFAULT_EXECUTEABLE_PATH,
+    def __init__(self, executable_path=DEFAULT_EXECUTABLE_PATH,
                  port=0, options=None,
                  desired_capabilities=DesiredCapabilities.WPEWEBKIT,
                  service_log_path=None):
