diff --git a/tests/test_brave_driver.py b/tests/test_brave_driver.py index b5bb9a44..2c78d39f 100644 --- a/tests/test_brave_driver.py +++ b/tests/test_brave_driver.py @@ -17,7 +17,7 @@ def test_driver_with_ssl_verify_disabled_can_be_downloaded(ssl_verify_enable): "ssl_disabled", ) driver_path = ChromeDriverManager( - version="87.0.4280.88", + driver_version="87.0.4280.88", cache_manager=DriverCacheManager(custom_path), chrome_type=ChromeType.BRAVE, ).install() @@ -55,7 +55,7 @@ def test_brave_manager_with_wrong_version(): @pytest.mark.parametrize('os_type', ['win32', 'win64']) def test_can_get_brave_for_win(os_type): - path = ChromeDriverManager(version="83.0.4103.39", + path = ChromeDriverManager(driver_version="83.0.4103.39", os_system_manager=OperationSystemManager(os_type), chrome_type=ChromeType.BRAVE).install() assert os.path.exists(path) diff --git a/tests/test_chrome_driver.py b/tests/test_chrome_driver.py index 04ec2805..dbe5f91d 100644 --- a/tests/test_chrome_driver.py +++ b/tests/test_chrome_driver.py @@ -39,7 +39,7 @@ def test_chrome_manager_with_project_root_local_folder(delete_drivers_dir): def test_driver_can_be_saved_to_custom_path(): custom_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "custom") - path = ChromeDriverManager(version="87.0.4280.88", cache_manager=DriverCacheManager(custom_path)).install() + path = ChromeDriverManager(driver_version="87.0.4280.88", cache_manager=DriverCacheManager(custom_path)).install() assert os.path.exists(path) assert custom_path in path diff --git a/tests/test_chromium_driver.py b/tests/test_chromium_driver.py index 78b79b30..db603283 100644 --- a/tests/test_chromium_driver.py +++ b/tests/test_chromium_driver.py @@ -14,7 +14,7 @@ def test_driver_with_ssl_verify_disabled_can_be_downloaded(ssl_verify_enable): "ssl_disabled", ) driver_path = ChromeDriverManager( - version="87.0.4280.88", + driver_version="87.0.4280.88", cache_manager=DriverCacheManager(custom_path), chrome_type=ChromeType.CHROMIUM, ).install() @@ -30,7 +30,7 @@ def test_chromium_manager_with_specific_version(): def test_driver_can_be_saved_to_custom_path(): custom_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "custom") - path = ChromeDriverManager(version="87.0.4280.88", cache_manager=DriverCacheManager(custom_path), + path = ChromeDriverManager(driver_version="87.0.4280.88", cache_manager=DriverCacheManager(custom_path), chrome_type=ChromeType.CHROMIUM).install() assert os.path.exists(path) assert custom_path in path @@ -44,7 +44,7 @@ def test_chromium_manager_with_wrong_version(): @pytest.mark.parametrize('os_type', ['win32', 'win64']) def test_can_get_chromium_for_win(os_type): - path = ChromeDriverManager(version="83.0.4103.39", + path = ChromeDriverManager(driver_version="83.0.4103.39", os_system_manager=OperationSystemManager(os_type), chrome_type=ChromeType.CHROMIUM).install() assert os.path.exists(path) diff --git a/tests/test_downloader.py b/tests/test_downloader.py index e762e3fa..fd5ed40f 100644 --- a/tests/test_downloader.py +++ b/tests/test_downloader.py @@ -33,7 +33,7 @@ def test_can_download_driver_as_tar_gz(delete_drivers_dir): @pytest.mark.parametrize('version', ["2.26"]) def test_can_download_chrome_driver(delete_drivers_dir, version): driver = ChromeDriver(name="chromedriver", - version=version, + driver_version=version, os_system_manager=OperationSystemManager("win32"), url="http://chromedriver.storage.googleapis.com", latest_release_url="http://chromedriver.storage.googleapis.com/LATEST_RELEASE", diff --git a/webdriver_manager/chrome.py b/webdriver_manager/chrome.py index 7991b582..44a76094 100644 --- a/webdriver_manager/chrome.py +++ b/webdriver_manager/chrome.py @@ -11,7 +11,7 @@ class ChromeDriverManager(DriverManager): def __init__( self, - version: Optional[str] = None, + driver_version: Optional[str] = None, name: str = "chromedriver", url: str = "https://chromedriver.storage.googleapis.com", latest_release_url: str = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE", @@ -27,7 +27,7 @@ def __init__( self.driver = ChromeDriver( name=name, - version=version, + driver_version=driver_version, url=url, latest_release_url=latest_release_url, chrome_type=chrome_type, diff --git a/webdriver_manager/core/driver.py b/webdriver_manager/core/driver.py index 3af7c82a..d4c1d36d 100644 --- a/webdriver_manager/core/driver.py +++ b/webdriver_manager/core/driver.py @@ -7,14 +7,14 @@ class Driver(object): def __init__( self, name, - version, + driver_version, url, latest_release_url, http_client, os_system_manager): self._name = name self._url = url - self._version = version + self._driver_version = driver_version self._latest_release_url = latest_release_url self._http_client = http_client self._browser_version = None @@ -47,7 +47,7 @@ def get_driver_version_to_download(self): Downloads determined browser version driver in all other ways as a bonus fallback for lazy users. """ if not self._driver_to_download_version: - self._driver_to_download_version = self._version if self._version not in (None, "latest") \ + self._driver_to_download_version = self._driver_version if self._driver_version not in (None, "latest") \ else self.get_latest_release_version() return self._driver_to_download_version diff --git a/webdriver_manager/core/driver_cache.py b/webdriver_manager/core/driver_cache.py index 9d11a17a..ddcae194 100644 --- a/webdriver_manager/core/driver_cache.py +++ b/webdriver_manager/core/driver_cache.py @@ -142,7 +142,7 @@ def __get_metadata_key(self, driver: Driver): def get_cache_key_driver_version(self, driver: Driver): if self._cache_key_driver_version is None: - self._cache_key_driver_version = "latest" if driver._version in (None, "latest") else driver._version + self._cache_key_driver_version = "latest" if driver._driver_version in (None, "latest") else driver._driver_version return self._cache_key_driver_version def __get_path(self, driver: Driver): diff --git a/webdriver_manager/drivers/chrome.py b/webdriver_manager/drivers/chrome.py index 1dcf0659..41de1b45 100644 --- a/webdriver_manager/drivers/chrome.py +++ b/webdriver_manager/drivers/chrome.py @@ -10,7 +10,7 @@ class ChromeDriver(Driver): def __init__( self, name, - version, + driver_version, url, latest_release_url, http_client, @@ -19,7 +19,7 @@ def __init__( ): super(ChromeDriver, self).__init__( name, - version, + driver_version, url, latest_release_url, http_client, @@ -73,7 +73,7 @@ def get_latest_release_version(self): latest_release_url = ( self._latest_release_url - if (self._version == "latest" or determined_browser_version is None) + if (self._driver_version == "latest" or determined_browser_version is None) else f"{self._latest_release_url}_{determined_browser_version}" ) resp = self._http_client.get(url=latest_release_url) diff --git a/webdriver_manager/drivers/edge.py b/webdriver_manager/drivers/edge.py index c0b50889..2cee215f 100644 --- a/webdriver_manager/drivers/edge.py +++ b/webdriver_manager/drivers/edge.py @@ -8,7 +8,7 @@ class EdgeChromiumDriver(Driver): def __init__( self, name, - version, + driver_version, url, latest_release_url, http_client, @@ -16,7 +16,7 @@ def __init__( ): super(EdgeChromiumDriver, self).__init__( name, - version, + driver_version, url, latest_release_url, http_client, @@ -36,7 +36,7 @@ def get_latest_release_version(self) -> str: edge_driver_version_to_download = ( self.get_stable_release_version() - if (self._version == "latest" or determined_browser_version is None) + if (self._driver_version == "latest" or determined_browser_version is None) else determined_browser_version ) major_edge_version = edge_driver_version_to_download.split(".")[0] diff --git a/webdriver_manager/drivers/firefox.py b/webdriver_manager/drivers/firefox.py index fb8f1147..2a5f73a3 100644 --- a/webdriver_manager/drivers/firefox.py +++ b/webdriver_manager/drivers/firefox.py @@ -6,7 +6,7 @@ class GeckoDriver(Driver): def __init__( self, name, - version, + driver_version, url, latest_release_url, mozila_release_tag, @@ -15,7 +15,7 @@ def __init__( ): super(GeckoDriver, self).__init__( name, - version, + driver_version, url, latest_release_url, http_client, diff --git a/webdriver_manager/drivers/ie.py b/webdriver_manager/drivers/ie.py index 909918ca..dc7c1c8d 100644 --- a/webdriver_manager/drivers/ie.py +++ b/webdriver_manager/drivers/ie.py @@ -7,7 +7,7 @@ class IEDriver(Driver): def __init__( self, name, - version, + driver_version, url, latest_release_url, ie_release_tag, @@ -16,7 +16,7 @@ def __init__( ): super(IEDriver, self).__init__( name, - version, + driver_version, url, latest_release_url, http_client, diff --git a/webdriver_manager/drivers/opera.py b/webdriver_manager/drivers/opera.py index a9451412..993d38b4 100644 --- a/webdriver_manager/drivers/opera.py +++ b/webdriver_manager/drivers/opera.py @@ -6,7 +6,7 @@ class OperaDriver(Driver): def __init__( self, name, - version, + driver_version, url, latest_release_url, opera_release_tag, @@ -15,7 +15,7 @@ def __init__( ): super(OperaDriver, self).__init__( name, - version, + driver_version, url, latest_release_url, http_client, diff --git a/webdriver_manager/firefox.py b/webdriver_manager/firefox.py index 4818d5eb..392e254c 100644 --- a/webdriver_manager/firefox.py +++ b/webdriver_manager/firefox.py @@ -26,7 +26,7 @@ def __init__( ) self.driver = GeckoDriver( - version=version, + driver_version=version, name=name, url=url, latest_release_url=latest_release_url, diff --git a/webdriver_manager/microsoft.py b/webdriver_manager/microsoft.py index 225354dd..7e170a88 100644 --- a/webdriver_manager/microsoft.py +++ b/webdriver_manager/microsoft.py @@ -27,7 +27,7 @@ def __init__( ) self.driver = IEDriver( - version=version, + driver_version=version, name=name, url=url, latest_release_url=latest_release_url, @@ -57,7 +57,7 @@ def __init__( ) self.driver = EdgeChromiumDriver( - version=version, + driver_version=version, name=name, url=url, latest_release_url=latest_release_url, diff --git a/webdriver_manager/opera.py b/webdriver_manager/opera.py index bfb65ecd..214c6f60 100755 --- a/webdriver_manager/opera.py +++ b/webdriver_manager/opera.py @@ -30,7 +30,7 @@ def __init__( self.driver = OperaDriver( name=name, - version=version, + driver_version=version, url=url, latest_release_url=latest_release_url, opera_release_tag=opera_release_tag,