Skip to content

Commit

Permalink
delete driver manager options
Browse files Browse the repository at this point in the history
  • Loading branch information
s.pirohov committed Jul 23, 2023
1 parent f284a43 commit c12f5a3
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions tests/test_brave_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion tests/test_chrome_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions tests/test_chromium_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand All @@ -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)
2 changes: 1 addition & 1 deletion tests/test_downloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions webdriver_manager/chrome.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions webdriver_manager/core/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion webdriver_manager/core/driver_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 3 additions & 3 deletions webdriver_manager/drivers/chrome.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class ChromeDriver(Driver):
def __init__(
self,
name,
version,
driver_version,
url,
latest_release_url,
http_client,
Expand All @@ -19,7 +19,7 @@ def __init__(
):
super(ChromeDriver, self).__init__(
name,
version,
driver_version,
url,
latest_release_url,
http_client,
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions webdriver_manager/drivers/edge.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ class EdgeChromiumDriver(Driver):
def __init__(
self,
name,
version,
driver_version,
url,
latest_release_url,
http_client,
os_system_manager
):
super(EdgeChromiumDriver, self).__init__(
name,
version,
driver_version,
url,
latest_release_url,
http_client,
Expand All @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions webdriver_manager/drivers/firefox.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class GeckoDriver(Driver):
def __init__(
self,
name,
version,
driver_version,
url,
latest_release_url,
mozila_release_tag,
Expand All @@ -15,7 +15,7 @@ def __init__(
):
super(GeckoDriver, self).__init__(
name,
version,
driver_version,
url,
latest_release_url,
http_client,
Expand Down
4 changes: 2 additions & 2 deletions webdriver_manager/drivers/ie.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class IEDriver(Driver):
def __init__(
self,
name,
version,
driver_version,
url,
latest_release_url,
ie_release_tag,
Expand All @@ -16,7 +16,7 @@ def __init__(
):
super(IEDriver, self).__init__(
name,
version,
driver_version,
url,
latest_release_url,
http_client,
Expand Down
4 changes: 2 additions & 2 deletions webdriver_manager/drivers/opera.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class OperaDriver(Driver):
def __init__(
self,
name,
version,
driver_version,
url,
latest_release_url,
opera_release_tag,
Expand All @@ -15,7 +15,7 @@ def __init__(
):
super(OperaDriver, self).__init__(
name,
version,
driver_version,
url,
latest_release_url,
http_client,
Expand Down
2 changes: 1 addition & 1 deletion webdriver_manager/firefox.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(
)

self.driver = GeckoDriver(
version=version,
driver_version=version,
name=name,
url=url,
latest_release_url=latest_release_url,
Expand Down
4 changes: 2 additions & 2 deletions webdriver_manager/microsoft.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def __init__(
)

self.driver = IEDriver(
version=version,
driver_version=version,
name=name,
url=url,
latest_release_url=latest_release_url,
Expand Down Expand Up @@ -57,7 +57,7 @@ def __init__(
)

self.driver = EdgeChromiumDriver(
version=version,
driver_version=version,
name=name,
url=url,
latest_release_url=latest_release_url,
Expand Down
2 changes: 1 addition & 1 deletion webdriver_manager/opera.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit c12f5a3

Please sign in to comment.