Promium 3.6.2__tar.gz → 3.6.4__tar.gz

{promium-3.6.2 → promium-3.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.6.2
+Version: 3.6.4
 Summary: Selenium wrapper for testing Web UI
 Author: Denis Korytkin, Nataliia Guieva, Roman Zaporozhets, Vladimir Kritov, Oleh Dykusha
 Project-URL: Home page, https://none

{promium-3.6.2 → promium-3.6.4}/Promium.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.6.2
+Version: 3.6.4
 Summary: Selenium wrapper for testing Web UI
 Author: Denis Korytkin, Nataliia Guieva, Roman Zaporozhets, Vladimir Kritov, Oleh Dykusha
 Project-URL: Home page, https://none

{promium-3.6.2 → promium-3.6.4}/promium/assertions.py

@@ -108,11 +108,6 @@ class BaseSoftAssertion(object):
             with_screen=False,
     ):
         """Just like self.soft_assert_true(current == expected)"""
-        message = (
-            f"Current and expected has different data types: "
-            f"current is {type(current)}, expected is {type(expected)}\n"
-            if type(current) != type(expected) else ""
-        )
         diff = None
         if type(current) is list and type(expected) is list:
             diff = DeepDiff(current, expected, ignore_order=True)
@@ -122,12 +117,17 @@ class BaseSoftAssertion(object):
             if len(current_splitlines) > 1 or len(expected_splitlines) > 1:
                 diff = DeepDiff(current_splitlines, expected_splitlines)
         difference = f"\nDifference:\n{convert_container(diff)}" if diff else ""
+
+        type_current = type_expected = ''
+        if type(current) != type(expected):
+            type_current = f'({type(current)})'
+            type_expected = f'({type(expected)})'
+
         assert_message = (
             f"{base_msg(msg)}\n"
-            f"Current - {convert_container(current)}\n"
-            f"Expected - {convert_container(expected)}\n"
+            f"Current - {convert_container(current)} {type_current}\n"
+            f"Expected - {convert_container(expected)} {type_expected}\n"
             f"{difference}"
-            f"{message}"
         )
         return self.soft_assert_true(
             current == expected, assert_message, with_screen

{promium-3.6.2 → promium-3.6.4}/promium/browsers.py

@@ -42,21 +42,6 @@ def get_chrome_opera_options(
     options.add_argument("--ignore-certificate-errors")
     options.add_argument("--disable-notifications")
     options.add_argument("--dns-prefetch-disable")
-    options.add_argument("--proxy-bypass-list=*ws*;*chat*")
-    prefs = {
-        "download.default_directory": DOWNLOAD_PATH,
-        "download.directory_upgrade": True,
-        'prompt_for_download': False,
-        "profile.default_content_setting_values.cookies": 1,
-        "profile.block_third_party_cookies": True
-    }
-    options.add_experimental_option("prefs", prefs)
-    options.add_experimental_option("excludeSwitches", [
-        "enable-automation",  # disable the automation bar
-    ])
-    # fix use window.onbeforeunload
-    options.enable_bidi = True
-    options.unhandled_prompt_behavior = 'ignore'
 
     if device.__class__.__name__ == "CustomDevice":
         mobile_emulation = {
@@ -79,8 +64,10 @@ def get_chrome_opera_options(
     return options
 
 
-def get_chrome_options(device, proxy_server=None, is_headless=False):
-    options = ChromeOptions()
+def get_chrome_options(
+        device, proxy_server=None, is_headless=False, default_options=None
+):
+    options = default_options if default_options else ChromeOptions()
     return get_chrome_opera_options(options, device, proxy_server, is_headless)
 
 
@@ -202,7 +189,15 @@ class RemoteBrowser(webdriver.Remote):
 
 class ChromeBrowser(webdriver.Chrome):
 
-    def __init__(self, *args, device, proxy_server, is_headless, **kwargs):
+    def __init__(
+            self,
+            *args,
+            device,
+            proxy_server,
+            is_headless,
+            browser_options=None,
+            **kwargs,
+    ):
         """
         Initialise a new Chrome WebDriver instance.
         """
@@ -220,7 +215,7 @@ class ChromeBrowser(webdriver.Chrome):
             capabilities.update(proxy_capabilities.to_capabilities())
 
         options = get_chrome_options(
-            device, proxy_server, is_headless
+            device, proxy_server, is_headless, browser_options,
         )
         if is_headless:
             options.accept_insecure_certs = True

{promium-3.6.2 → promium-3.6.4}/promium/device_config.py

@@ -1,11 +1,12 @@
-
+import os
 from typing import NamedTuple
 
 
 DEFAULT_USER_AGENT_ANDROID = (
-    "Mozilla/5.0 (Linux; Android 14; SM-G960U) "
-    "AppleWebKit/537.36 (KHTML, like Gecko) "
-    "Chrome/131.0.0.0 Mobile Safari/537.36"
+    f"Mozilla/5.0 (Linux; Android 14; SM-G960U) "
+    f"AppleWebKit/537.36 (KHTML, like Gecko) "
+    f"Chrome/{os.environ.get('GOOGLE_CHROME_VERSION', '131.0.6778.39')} "
+    f"Mobile Safari/537.36"
 )
 DEFAULT_USER_AGENT_IOS = (
     "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) "
@@ -13,9 +14,10 @@ DEFAULT_USER_AGENT_IOS = (
     "Version/17.4.1 Mobile/15E148 Safari/604.1"
 )
 DEFAULT_USER_AGENT_HUAWEI = (
-    "Mozilla/5.0 (Linux; Android 11; HUAWEI Mate 40 Pro Build/HUAWEIMate40Pro; "
-    "xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) "
-    "Chrome/131.0.0.0 Mobile Safari/537.36"
+    f"Mozilla/5.0 (Linux; Android 11; HUAWEI Mate 40 Pro Build/HUAWEIMate40Pro;"
+    f" xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) "
+    f"Chrome/{os.environ.get('GOOGLE_CHROME_VERSION', '131.0.6778.39')} "
+    f"Mobile Safari/537.36"
 )
 
 

{promium-3.6.2 → promium-3.6.4}/promium/plugin.py

@@ -31,24 +31,6 @@ DEFAULT_HEADERS = {
 }
 
 
-def pytest_sessionstart(session):
-    if hasattr(session.config, 'cache'):
-        cache = session.config.cache
-        cache_path = f"cache/{session.config.lastfailed_file}"
-        print("Lastfailed:", len(cache.get(cache_path, set())))
-    session.run_duration = datetime.datetime.now()
-    print("\nPytest session start %s\n" % session.run_duration)
-
-
-@pytest.mark.trylast
-def pytest_sessionfinish(session):
-    finish = datetime.datetime.now()
-    duration = datetime.timedelta(
-        seconds=(finish - session.run_duration).seconds
-    )
-    print("\n\nPytest session finish %s (duration=%s)\n" % (finish, duration))
-
-
 @pytest.hookimpl
 def pytest_addoption(parser):
     parser.addoption(
@@ -252,7 +234,12 @@ def driver_init(request):
         proxy_server = request.config.proxy_server
     else:
         proxy_server = None
-    driver = create_driver(device, proxy_server=proxy_server)
+    browser_options = getattr(request.cls, "browser_options", None)
+    driver = create_driver(
+        device,
+        proxy_server=proxy_server,
+        browser_options=browser_options,
+    )
     driver.xrequestid = request.cls.xrequestid
     request.cls.driver = request.config.driver = driver
     request.config.get_fail_debug = _get_fail_debug
@@ -408,7 +395,6 @@ def pytest_configure(config):
         'ignore:A true SSLContext object is not available, '
         'ignore:Unverified HTTPS request is being made'
     )
-    os.environ['TEST_CASE'] = "True"
 
     if config.getoption('--headless'):
         os.environ['HEADLESS'] = 'Enabled'

{promium-3.6.2 → promium-3.6.4}/promium/test_case.py

@@ -72,7 +72,8 @@ def timeout(seconds=5, error_message=os.strerror(errno.ETIME)):
 
 @timeout(300)
 def create_driver(
-        device, proxy_server=None, env_var='SE_DRIVER', default='chrome://'
+        device, proxy_server=None, env_var='SE_DRIVER', default='chrome://',
+        browser_options=None,
 ):
     """
     Examples:
@@ -87,6 +88,8 @@ def create_driver(
         "proxy_server": proxy_server,
         "is_headless": os.environ.get("HEADLESS") == "Enabled",
     }
+    if browser_options and 'chrome' in browser_options.__module__:
+        driver_options["browser_options"] = browser_options
 
     driver_dsn = os.environ.get(env_var) or default
 

{promium-3.6.2 → promium-3.6.4}/setup.py

@@ -19,7 +19,7 @@ REQUIREMENTS = [
 
 setup(
     name='Promium',
-    version='3.6.2',
+    version='3.6.4',
     install_requires=REQUIREMENTS,
     author='Denis Korytkin, Nataliia Guieva, '
            'Roman Zaporozhets, Vladimir Kritov, '