Merge branch 'botcity-dev:main' into ENH/binary_path

Author: kayqueGovetri

.github/workflows/ci.yml

@@ -36,9 +36,6 @@ jobs:
           #   * https://github.com/abhi1693/setup-browser/issues/8
           - os: windows-latest
             browser: "firefox"
-          # Install wrong version in macOS.
-          - os: macos-latest
-            browser: "undetected_chrome"
 
     steps:
       - uses: actions/checkout@v2

botcity/web/bot.py

@@ -18,7 +18,7 @@
 from botcity.base.utils import only_if_element
 from bs4 import BeautifulSoup
 from PIL import Image
-from selenium.common.exceptions import InvalidSessionIdException
+from selenium.common.exceptions import InvalidSessionIdException, WebDriverException
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.common.exceptions import StaleElementReferenceException
 from selenium.webdriver.common.by import By
@@ -280,10 +280,32 @@ def check_driver():
         self.capabilities = cap
         driver_path = self.driver_path or check_driver()
         self.driver_path = driver_path
-        self._driver = driver_class(**self._get_parameters_to_driver())
+        self._driver = self._instantiate_driver(driver_class=driver_class, func_def_options=func_def_options)
         self._others_configurations()
         self.set_screen_resolution()
 
+    def _instantiate_driver(self, driver_class, func_def_options):
+        """
+        It is necessary to create this function because we isolated the instantiation of the driver,
+        giving options to solve some bugs, mainly in undetected chrome.
+        """
+        try:
+            driver = driver_class(**self._get_parameters_to_driver())
+        except WebDriverException as error:
+            # TODO: 'Undetected Chrome' fix error to upgrade version chrome.
+            if 'This version of ChromeDriver only supports Chrome version' in error.msg:
+                self.stop_browser()
+                try:
+                    correct_version = int(error.msg.split('Current browser version is ')[1].split('.')[0])
+                except Exception:
+                    raise error
+                self.options = func_def_options(self.headless, self._download_folder_path, None,
+                                                self.page_load_strategy)
+                driver = driver_class(**self._get_parameters_to_driver(), version_main=correct_version)
+            else:
+                raise error
+        return driver
+
     def _get_parameters_to_driver(self):
         if self.browser == Browser.UNDETECTED_CHROME:
             return {"options": self.options,
@@ -324,6 +346,8 @@ def stop_browser(self):
         """
         if not self._driver:
             return
+        if self.get_tabs():
+            self.activate_tab(self.get_tabs()[-1])
         self._driver.close()
         self._driver.quit()
         self.options = None

botcity/web/browsers/edge.py

@@ -47,7 +47,7 @@ def default_options(headless=False, download_folder_path=None, user_data_dir=Non
     edge_options.add_argument("--disable-syncdisable-translate")
     edge_options.add_argument("--metrics-recording-only")
     edge_options.add_argument("--safebrowsing-disable-auto-update")
-
+    edge_options.add_argument("--disable-features=msSmartScreenProtection")
     edge_options.add_argument("--disable-blink-features=AutomationControlled")
 
     # Disable banner for Browser being remote-controlled

botcity/web/browsers/undetected_chrome.py

@@ -1,6 +1,7 @@
 import atexit
 import json
 import os
+import platform
 import tempfile
 from typing import Dict
 
@@ -66,7 +67,7 @@ def default_options(headless=False, download_folder_path=None, user_data_dir=Non
     # Check if user is root
     try:
         # This is only valid with Unix
-        if os.geteuid() == 0:
+        if os.geteuid() == 0 or platform.system() == 'Darwin':
             chrome_options.add_argument("--no-sandbox")
     except AttributeError:
         pass

conftest.py

@@ -117,6 +117,7 @@ def download_driver(request):
     browser = request.config.getoption("--browser") or Browser.CHROME
     manager = factory_driver_manager(browser=browser)
     installed_driver = manager(path=folder_driver).install()
+
     yield installed_driver
     # Issue: https://github.com/ultrafunkamsterdam/undetected-chromedriver/issues/551
     if platforms.get(platform.system()) == "windows" and browser == Browser.UNDETECTED_CHROME:

test-requirements.txt

@@ -1,3 +1,4 @@
 pytest
 pytest-xdist
-webdriver-manager
+webdriver-manager
+pytest-rerunfailures

tests/test_browser.py

@@ -43,7 +43,7 @@ def test_display_size(web: WebBot):
     web.set_screen_resolution(1280, 720)
     (w, h) = web.display_size()
 
-    assert w in [1280, 1233, 1223, 1028, 1264]
+    assert w in [1280, 1233, 1223, 1028, 1264, 1176]
 
 
 def test_javascript(web: WebBot):
@@ -214,7 +214,7 @@ def test_get_view_port_size(web: WebBot):
         element = [width, height]
     else:
         element = web.find_element('window-size', By.ID).text.split('x')
-    sizes = [tuple(int(e) for e in element), (1600, 900)]
+    sizes = [tuple(int(e) for e in element), (1600, 900), (1176, 802)]
     assert size in sizes
 
 
@@ -246,6 +246,7 @@ def test_set_screen_resolution(web: WebBot):
     assert width in ['500', '1600', '484']
 
 
+@pytest.mark.flaky(reruns=3)
 def test_wait_for_downloads(web: WebBot):
     fake_bin_path = conftest.get_fake_bin_path(web=web)
 
@@ -258,6 +259,7 @@ def test_wait_for_downloads(web: WebBot):
     assert os.path.exists(fake_bin_path) and os.path.getsize(fake_bin_path) > 0
 
 
+@pytest.mark.flaky(reruns=3)
 def test_wait_for_file(web: WebBot):
     fake_bin_path = conftest.get_fake_bin_path(web=web)
 
@@ -294,3 +296,9 @@ def test_print_pdf(web: WebBot, tmp_folder):
 
     assert os.path.exists(pdf)
     os.remove(pdf)
+
+
+def test_disable_smart_screen(web: WebBot):
+    web.browse('https://nav.smartscreen.msft.net/other/malware.html')
+    h1 = web.find_element(by=By.XPATH, selector='/html/body/div/h1')
+    assert h1.text.lower() == 'this is a demonstration malware website'

tests/test_mouse.py

@@ -234,7 +234,8 @@ def test_get_element_coors(web: WebBot):
     web.click_at(x, y)
 
     result = conftest.get_event_result('element-result', web)
-    assert result['data'] == ['Left'] or result['data'] == ['Left2']
+    results = [['Left2'], ['Left'], ['mouse-over']]
+    assert result['data'] in results
 
 
 def test_get_element_coors_centered(web: WebBot):

tests/test_vision.py

@@ -44,6 +44,7 @@ def test_get_last_element(web: WebBot):
     assert ele is not None
 
 
+@pytest.mark.flaky(reruns=3)
 def test_find_text(web: WebBot):
     web.browse(conftest.INDEX_PAGE)
     web.set_screen_resolution(3000, 2000)