Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions botcity/web/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,12 @@ def _others_configurations(self):
https://github.com/ultrafunkamsterdam/undetected-chromedriver/issues/260#issuecomment-901276808.
It will be a temporary solution.
"""
if self.browser == Browser.UNDETECTED_CHROME:
try:
self.driver.get("about:blank")
except Exception:
pass

params = {
"behavior": "allow",
"downloadPath": self.download_folder_path
Expand Down
16 changes: 15 additions & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,21 @@ def download_driver(request):
manager = factory_driver_manager(browser=browser)

cache_manager = DriverCacheManager(root_dir=folder_driver)
installed_driver = manager(cache_manager=cache_manager).install()

if browser == Browser.EDGE:
# The Edge webdriver download link has changed.
# Since the webdriver-manager is using the outdated link, it is necessary to pass it manually.
# References:
# - https://github.com/SeleniumHQ/selenium/issues/16073
# - https://github.com/SeleniumHQ/selenium/pull/16056
edge_driver_url = "https://msedgedriver.microsoft.com"
installed_driver = manager(
url=edge_driver_url,
latest_release_url=f"{edge_driver_url}/LATEST_RELEASE",
cache_manager=cache_manager
).install()
else:
installed_driver = manager(cache_manager=cache_manager).install()

yield installed_driver
# Issue: https://github.com/ultrafunkamsterdam/undetected-chromedriver/issues/551
Expand Down
3 changes: 3 additions & 0 deletions tests/test_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def test_close_page(web: WebBot):
def test_create_window(web: WebBot):
web.browse(conftest.INDEX_PAGE)
web.create_window(url=conftest.TEST_PAGE)
web.wait(3000)

title = web.page_title()
assert title == 'Page test'
Expand All @@ -42,6 +43,7 @@ def test_create_window(web: WebBot):
def test_display_size(web: WebBot):
web.browse(conftest.INDEX_PAGE)
web.set_screen_resolution(1280, 720)
web.wait(3000)
(w, h) = web.display_size()

assert w in [1280, 1233, 1223, 1028, 1264, 1176, 1256]
Expand Down Expand Up @@ -241,6 +243,7 @@ def test_scroll_up(web: WebBot):
def test_set_screen_resolution(web: WebBot):
web.browse(conftest.INDEX_PAGE)
web.set_screen_resolution(500, 500)
web.wait(3000)

page_size = web.find_element('page-size', By.ID).text
width = page_size.split('x')[0]
Expand Down
1 change: 1 addition & 0 deletions tests/test_vision.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def test_get_last_element(web: WebBot):
def test_find_text(web: WebBot):
web.browse(conftest.INDEX_PAGE)
web.set_screen_resolution(3000, 2000)
web.wait(3000)

web.add_image('hello_world', os.path.join(conftest.PROJECT_DIR, 'resources', 'hello_world.png'))
ele = web.find("hello_world", matching=0.97, waiting_time=20000)
Expand Down
Loading