Skip to content

Commit dd87c7b

Browse files
authored
Merge pull request #121 from botcity-dev/test/adjusting-browsers-setup
TEST: Adjusting unit tests
2 parents 6430090 + 4abc2ae commit dd87c7b

File tree

4 files changed

+25
-1
lines changed

4 files changed

+25
-1
lines changed

botcity/web/bot.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,12 @@ def _others_configurations(self):
356356
https://github.com/ultrafunkamsterdam/undetected-chromedriver/issues/260#issuecomment-901276808.
357357
It will be a temporary solution.
358358
"""
359+
if self.browser == Browser.UNDETECTED_CHROME:
360+
try:
361+
self.driver.get("about:blank")
362+
except Exception:
363+
pass
364+
359365
params = {
360366
"behavior": "allow",
361367
"downloadPath": self.download_folder_path

conftest.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,21 @@ def download_driver(request):
120120
manager = factory_driver_manager(browser=browser)
121121

122122
cache_manager = DriverCacheManager(root_dir=folder_driver)
123-
installed_driver = manager(cache_manager=cache_manager).install()
123+
124+
if browser == Browser.EDGE:
125+
# The Edge webdriver download link has changed.
126+
# Since the webdriver-manager is using the outdated link, it is necessary to pass it manually.
127+
# References:
128+
# - https://github.com/SeleniumHQ/selenium/issues/16073
129+
# - https://github.com/SeleniumHQ/selenium/pull/16056
130+
edge_driver_url = "https://msedgedriver.microsoft.com"
131+
installed_driver = manager(
132+
url=edge_driver_url,
133+
latest_release_url=f"{edge_driver_url}/LATEST_RELEASE",
134+
cache_manager=cache_manager
135+
).install()
136+
else:
137+
installed_driver = manager(cache_manager=cache_manager).install()
124138

125139
yield installed_driver
126140
# Issue: https://github.com/ultrafunkamsterdam/undetected-chromedriver/issues/551

tests/test_browser.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def test_close_page(web: WebBot):
3434
def test_create_window(web: WebBot):
3535
web.browse(conftest.INDEX_PAGE)
3636
web.create_window(url=conftest.TEST_PAGE)
37+
web.wait(3000)
3738

3839
title = web.page_title()
3940
assert title == 'Page test'
@@ -42,6 +43,7 @@ def test_create_window(web: WebBot):
4243
def test_display_size(web: WebBot):
4344
web.browse(conftest.INDEX_PAGE)
4445
web.set_screen_resolution(1280, 720)
46+
web.wait(3000)
4547
(w, h) = web.display_size()
4648

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

245248
page_size = web.find_element('page-size', By.ID).text
246249
width = page_size.split('x')[0]

tests/test_vision.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ def test_get_last_element(web: WebBot):
4848
def test_find_text(web: WebBot):
4949
web.browse(conftest.INDEX_PAGE)
5050
web.set_screen_resolution(3000, 2000)
51+
web.wait(3000)
5152

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

0 commit comments

Comments
 (0)