Promium 3.4.3__tar.gz → 3.5.0__tar.gz

{Promium-3.4.3 → Promium-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.4.3
+Version: 3.5.0
 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.4.3 → Promium-3.5.0}/Promium.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.4.3
+Version: 3.5.0
 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.4.3 → Promium-3.5.0}/promium/common.py

@@ -1,6 +1,8 @@
 import base64
 import os
 import datetime
+
+import allure
 import urllib3
 import json
 import time
@@ -249,17 +251,16 @@ def delete_element_from_dom(driver, element):
 def find_network_log(
         driver, find_mask, find_status=200, timeout=5, find_type=None
 ):
-    """ find xrh response and requset data from browser network logs
+    """ find xrh response and request data from browser network logs
     :param driver: selenium driver
     :param find_mask: find word in request url
     :param find_status: find response with this status
     :param timeout: tries
     :param find_type: check type request in network (example find_type='Fetch')
-    :return: {response, data, body} or None
+    :return: [{response, data, body}, {response, data, body}] or []
     """
-    found_logs = []
-
     def get_log(request_mask):
+        found_requests = []
         for performance_log in driver.get_log('performance'):
             # only response logs
             if (
@@ -270,49 +271,46 @@ def find_network_log(
                 if not json_log['params'].get('response'):
                     continue
                 response = json_log['params']['response']
-                found_logs.append({
-                    'url': response.get('url'),
-                    'status': (
-                        f"{response['status']} - {response['statusText']}"
+                if (
+                    response['status'] == find_status and (
+                        not find_type or json_log['params']['type'] == find_type
                     )
-                })
-                if response['status'] == find_status and (
-                        not find_type or
-                        json_log['params']['type'] == find_type):
-                    return json_log
+                ):
+                    found_requests.append(json_log)
+        return found_requests
 
     while timeout >= 0:
         xhr_log = get_log(find_mask)
         if xhr_log:
-            requestId = xhr_log['params']['requestId']  # noqa: N806
-            response = xhr_log['params']['response']
             break
         time.sleep(0.5)
         timeout -= 1
 
-    try:
-        request_data = driver.execute_cdp_cmd(
-            'Network.getRequestPostData', {'requestId': requestId}
-        )
-        request_data = json.loads(request_data['postData'])
-    except Exception:
-        request_data = None
-
-    try:
-        response_body = driver.execute_cdp_cmd(
-            'Network.getResponseBody', {'requestId': requestId}
+    result_all_logs = []
+    for network_log in xhr_log:
+        requestId = network_log['params']['requestId']  # noqa: N806
+        response = network_log['params']['response']
+        try:
+            request_data = driver.execute_cdp_cmd(
+                'Network.getRequestPostData', {'requestId': requestId}
+            )
+            request_data = json.loads(request_data['postData'])
+        except Exception:
+            request_data = None
+
+        try:
+            response_body = driver.execute_cdp_cmd(
+                'Network.getResponseBody', {'requestId': requestId}
+            )
+            response_body = json.loads(response_body['body'])
+        except Exception:
+            response_body = None
+
+        log.info(
+            f"[XHR Logs]: find by mask: '{find_mask}' -> {response.get('url')} "
+            f"{response.get('status')} - {response.get('statusText')}"
         )
-        response_body = json.loads(response_body['body'])
-    except Exception:
-        response_body = None
-
-    log.info(
-        f"[XHR Logs]: find by mask: '{find_mask}', result: {found_logs}, "
-        f"request_data: {request_data}, response_body: {response_body},"
-    )
-
-    if xhr_log:
-        return {
+        result_all_logs.append({
             'response': {
                 'url': response.get('url'),
                 'status': response.get('status'),
@@ -320,4 +318,11 @@ def find_network_log(
             },
             'data': request_data,
             'body': response_body,
-        }
+        })
+
+    allure.attach(
+        name=f"[XHR log] '{find_mask}', status:{find_status}, type:{find_type}",
+        body=json.dumps(result_all_logs, indent=4, ensure_ascii=False),
+        attachment_type=allure.attachment_type.JSON,
+    )
+    return result_all_logs

{Promium-3.4.3 → Promium-3.5.0}/setup.py

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