Promium 3.3.30__tar.gz → 3.4.0__tar.gz

{Promium-3.3.30 → Promium-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.3.30
+Version: 3.4.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
@@ -17,7 +17,7 @@ Requires-Python: >=3.10, <4
 License-File: LICENSE
 Requires-Dist: six>=1.10.0
 Requires-Dist: json_checker>=1.2.1
-Requires-Dist: requests>=2.10.0
+Requires-Dist: urllib3>=2.0.2
 Requires-Dist: py>=1.5.2
 Requires-Dist: pytest>=5.0.0
 Requires-Dist: pytest_rerunfailures>=4.1.0
@@ -30,7 +30,7 @@ Requires-Dist: selenium>=4.10.0
 Promium
 ========================
 
-.. image:: https://img.shields.io/badge/python-2.7%2C%203.5%2C%203.6-blue.svg
+.. image:: https://img.shields.io/badge/python-2.7%20...%203.12-blue.svg
     :target: https://pypi.org/project/Promium/
 
 .. image:: https://badge.fury.io/py/Promium.svg
@@ -41,6 +41,8 @@ Simple selenium wrapper from implemented UI tests
 
 Watch `documentation <https://qa-automation.git-doc.evo.dev/promium>`_
 
+Coverage `link <https://qa-automation.git-doc.evo.dev/promium/htmlcov/>`_
+
 Quick Start
 ========================
 

{Promium-3.3.30 → Promium-3.4.0}/Promium.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.3.30
+Version: 3.4.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
@@ -17,7 +17,7 @@ Requires-Python: >=3.10, <4
 License-File: LICENSE
 Requires-Dist: six>=1.10.0
 Requires-Dist: json_checker>=1.2.1
-Requires-Dist: requests>=2.10.0
+Requires-Dist: urllib3>=2.0.2
 Requires-Dist: py>=1.5.2
 Requires-Dist: pytest>=5.0.0
 Requires-Dist: pytest_rerunfailures>=4.1.0
@@ -30,7 +30,7 @@ Requires-Dist: selenium>=4.10.0
 Promium
 ========================
 
-.. image:: https://img.shields.io/badge/python-2.7%2C%203.5%2C%203.6-blue.svg
+.. image:: https://img.shields.io/badge/python-2.7%20...%203.12-blue.svg
     :target: https://pypi.org/project/Promium/
 
 .. image:: https://badge.fury.io/py/Promium.svg
@@ -41,6 +41,8 @@ Simple selenium wrapper from implemented UI tests
 
 Watch `documentation <https://qa-automation.git-doc.evo.dev/promium>`_
 
+Coverage `link <https://qa-automation.git-doc.evo.dev/promium/htmlcov/>`_
+
 Quick Start
 ========================
 

{Promium-3.3.30 → Promium-3.4.0}/Promium.egg-info/requires.txt

@@ -1,6 +1,6 @@
 six>=1.10.0
 json_checker>=1.2.1
-requests>=2.10.0
+urllib3>=2.0.2
 py>=1.5.2
 pytest>=5.0.0
 pytest_rerunfailures>=4.1.0

{Promium-3.3.30 → Promium-3.4.0}/README.rst

@@ -2,7 +2,7 @@
 Promium
 ========================
 
-.. image:: https://img.shields.io/badge/python-2.7%2C%203.5%2C%203.6-blue.svg
+.. image:: https://img.shields.io/badge/python-2.7%20...%203.12-blue.svg
     :target: https://pypi.org/project/Promium/
 
 .. image:: https://badge.fury.io/py/Promium.svg
@@ -13,6 +13,8 @@ Simple selenium wrapper from implemented UI tests
 
 Watch `documentation <https://qa-automation.git-doc.evo.dev/promium>`_
 
+Coverage `link <https://qa-automation.git-doc.evo.dev/promium/htmlcov/>`_
+
 Quick Start
 ========================
 

{Promium-3.3.30 → Promium-3.4.0}/promium/assertions.py

@@ -1,7 +1,7 @@
 
 import re
 import json
-import requests
+import urllib3
 import allure
 import logging
 
@@ -19,6 +19,17 @@ CoerceDict = Optional[Dict[str, type]]
 log = logging.getLogger(__name__)
 
 
+http = urllib3.PoolManager(
+    cert_reqs=False,
+    timeout=5,
+    headers={
+        "Accept-Encoding": 'gzip, deflate',
+        "Accept": "*/*",
+        "Connection": "keep-alive",
+    }
+)
+
+
 def base_msg(msg):
     return f"{msg}\n" if msg else ""
 
@@ -482,19 +493,17 @@ class WebDriverSoftAssertion(BaseSoftAssertion):
             error = f"{self.base_msg(default_msg=default_msg, extend_msg=msg)}"
             self.assertion_errors.append(error)
 
-    def soft_assert_image_status_code(
-        self, image, timeout=2, status_code=200, msg=None
-    ):
+    def soft_assert_image_status_code(self, image, status_code=200, msg=None):
         if not image.get_attribute('src'):
             return self.assertion_errors.append(
                 'Image does not have attribute "src"'
             )
 
         img_url = image.get_attribute('src')
-        response = requests.get(img_url, timeout=timeout, verify=False)
+        response = http.request(url=img_url, method='GET')
 
         self.soft_assert_equals(
-            response.status_code,
+            response.status,
             status_code,
             msg=msg if msg else 'img status code != 200'
         )

{Promium-3.3.30 → Promium-3.4.0}/promium/base.py

@@ -3,7 +3,7 @@ import logging
 import os
 import random
 import time
-import requests
+import urllib3
 from collections.abc import Sequence
 
 from functools import wraps
@@ -156,15 +156,30 @@ class Page(object):
 
     def get_status_code(self):
         """ get status_code from current page """
-        session = requests.Session()
-        for cookie in self.driver.get_cookies():
-            session.cookies.set(cookie['name'], cookie['value'])
-        r = session.get(
+        http = urllib3.PoolManager(
+            cert_reqs=False,
+            timeout=5,
+        )
+        cookies_str = '; '.join([
+            f'{cookie["name"]}={cookie["value"]}'
+            for cookie in self.driver.get_cookies()
+        ])
+        r = http.request(
             url=self.driver.current_url,
-            timeout=5, verify=False, allow_redirects=False
+            method='GET',
+            headers={
+                "Accept-Encoding": 'gzip, deflate',
+                "Accept": "*/*",
+                "Connection": "keep-alive",
+                'Cookie': cookies_str,
+            },
+            redirect=False,
+            retries=urllib3.Retry(
+                redirect=0,
+                raise_on_redirect=False,
+            ),
         )
-        session.close()
-        return r.status_code
+        return r.status
 
     def wait_for_animation(self):
         wait_for_animation(self.driver)
@@ -375,7 +390,9 @@ class Collection(Base, Sequence):
         """
         return self.find_all(by, locator).get_item(0)
 
-    def find_by_text(self, text, check_negative=False, partial_text=True):
+    def find_by_text(
+            self, text, check_negative=False, partial_text=True
+    ) -> 'Element':
         found_elements_by_test = []
         if partial_text:
             script = """

{Promium-3.3.30 → Promium-3.4.0}/promium/common.py

@@ -1,8 +1,7 @@
-
+import base64
 import os
 import datetime
-import urllib
-import requests
+import urllib3
 import json
 import time
 import logging
@@ -17,6 +16,13 @@ from promium.waits import (
 
 log = logging.getLogger(__name__)
 
+
+http = urllib3.PoolManager(
+    cert_reqs=False,
+    timeout=5,
+)
+
+
 SCREENSHOT_SERVER_HOST = os.environ.get("SCREENSHOT_SERVER_HOST")
 SCREENSHOT_SERVER_LOGIN = os.environ.get("SCREENSHOT_SERVER_LOGIN")
 SCREENSHOT_SERVER_PASSWORD = os.environ.get("SCREENSHOT_SERVER_PASSWORD")
@@ -136,12 +142,16 @@ def get_screenshot_path(name, with_date=True):
 
 def if_server_have_problem():
     try:
-        r = requests.get(
+        r = http.request(
             url=f"https://{SCREENSHOT_SERVER_HOST}",
-            verify=False,
-            timeout=(5, 5),
+            method='GET',
+            headers={
+                'Accept-Encoding': 'gzip, deflate',
+                'Accept': '*/*',
+                'Connection': 'keep-alive',
+            },
         )
-        r.raise_for_status()
+        assert r.status <= 400, f'Have problem {r.status}: {r.reason}'
         return False
     except Exception as e:
         return str(e)
@@ -166,14 +176,23 @@ def _upload_to_server(screenshot_path, screenshot_name):
             chunks -= 1
 
     screenshot_url = f"https://{SCREENSHOT_SERVER_HOST}/{screenshot_name}"
-    r = requests.put(
+    r = http.request(
         url=screenshot_url,
-        auth=(SCREENSHOT_SERVER_LOGIN, SCREENSHOT_SERVER_PASSWORD),
-        data=read_in_chunks(open(screenshot_path, 'rb')),
-        verify=False,
+        method='PUT',
+        headers={
+            'Accept-Encoding': 'gzip, deflate',
+            'Accept': '*/*',
+            'Connection': 'keep-alive',
+            'Content-Type': 'application/json',
+            'Authorization': 'Basic ' + base64.b64encode(
+                f'{SCREENSHOT_SERVER_LOGIN}:{SCREENSHOT_SERVER_PASSWORD}'
+                ''.encode()
+            ).decode()
+        },
+        body=read_in_chunks(open(screenshot_path, 'rb')),
     )
     os.remove(screenshot_path)
-    if not r.ok:
+    if r.status != 201:
         return (
             f"Screenshot not uploaded to server. "
             f"Status code: {r.status_code}, reason: {r.reason}"
@@ -197,15 +216,6 @@ def upload_screenshot(driver, path_name="screenshot", path_with_date=True):
         return f'No screenshot was captured due to exception {repr(e)}'
 
 
-def download_and_check_file(download_url, file_path):
-    try:
-        urllib.urlretrieve(download_url, file_path)
-        return bool(os.path.isfile(file_path) and os.path.exists(file_path))
-    finally:
-        if os.path.exists(file_path):
-            os.remove(file_path)
-
-
 def control_plus_key(driver, key):
     """Imitations press CONTROL key + any key"""
     (

{Promium-3.3.30 → Promium-3.4.0}/promium/elements/link.py

@@ -1,5 +1,5 @@
 
-import requests
+import urllib3
 import logging
 
 from promium.base import Element
@@ -33,12 +33,26 @@ class Link(Element):
 
     @property
     def response(self):
-        session = requests.Session()
-        for cookie in self.driver.get_cookies():
-            session.cookies.set(cookie['name'], cookie['value'])
+        http = urllib3.PoolManager(
+            cert_reqs=False,
+            timeout=5,
+        )
+        cookies_str = '; '.join([
+            f'{cookie["name"]}={cookie["value"]}'
+            for cookie in self.driver.get_cookies()
+        ])
         for i in range(1, 3):
-            r = session.get(self.href, verify=False, timeout=10)
-            if r.status_code in [502, 503, 504] and r.request.method == 'GET':
+            r = http.request(
+                url=self.href,
+                method='GET',
+                headers={
+                    "Accept-Encoding": 'gzip, deflate',
+                    "Accept": "*/*",
+                    "Connection": "keep-alive",
+                    "Cookie": cookies_str,
+                },
+            )
+            if r.status in [502, 503, 504]:
                 log.warning(f'[Request Retry]: attempt:{i}, status: {r.status}')
             else:
                 break
@@ -47,5 +61,5 @@ class Link(Element):
 
     @property
     def get_status_code(self):
-        """Gets status requests code from link"""
-        return self.response.status_code
+        """Gets status response code from link"""
+        return self.response.status

{Promium-3.3.30 → Promium-3.4.0}/promium/logger.py

@@ -223,31 +223,27 @@ class LoggerHandler(logging.StreamHandler):
         self.stream.close()
 
 
-def request_logging(request, *args, **kwargs):
-    content = str(request.content)
+def request_logging(request, url, method, **kwargs):
+    content = str(request.data)
     warning_message = (
         "[Python request] STATUS CODE: {status_code}, LINK: {link}\n"
         "{tabs}METHOD: {method}\n"
         "{tabs}BODY: {body}\n"
         "{tabs}RESPONSE CONTENT: "
         "{content}{ellipsis} ({length} symbols)\n".format(
-            status_code=request.status_code,
-            method=request.request.method,
-            link=request.url,
-            body=request.request.body,
+            status_code=request.status,
+            method=method,
+            link=url,
+            body=kwargs.get('body'),
             content=re.sub(r'\s+', ' ', content)[:MAX_SYMBOLS],
             ellipsis=" ..." if len(content) > MAX_SYMBOLS else "",
-            length=len(request.content),
+            length=len(request.data),
             tabs=" " * 12,
         )
     )
-    if 400 <= request.status_code < 500:
+    if 400 <= request.status < 500:
         log.warning(warning_message)
-    elif request.status_code >= 500:
+    elif request.status >= 500:
         log.error(warning_message)
     else:
-        log.info(
-            "[Python request] STATUS CODE: {status_code}, LINK: {link}".format(
-                status_code=request.status_code, link=request.url
-            )
-        )
+        log.info(f"[Python request] STATUS CODE: {request.status}, LINK: {url}")

{Promium-3.3.30 → Promium-3.4.0}/promium/plugin.py

@@ -1,7 +1,7 @@
 import os
 import datetime
 import logging
-import requests
+import urllib3
 from collections import namedtuple
 
 import pytest
@@ -24,6 +24,12 @@ FailInfoRequest = namedtuple('FailInfoRequest', [
     'test_type', 'url', 'test_case', 'status_code', 'run_command', 'txid'
 ])
 
+DEFAULT_HEADERS = {
+    "Accept-Encoding": 'gzip, deflate',
+    "Accept": "*/*",
+    "Connection": "keep-alive",
+}
+
 
 def pytest_sessionstart(session):
     if hasattr(session.config, 'cache'):
@@ -143,19 +149,19 @@ def request_init(request):
             txid=(request.cls.xrequestid, [None])[0],
         )
 
-    session = requests.session()
+    session = urllib3.PoolManager(
+        cert_reqs=False,
+        timeout=15,
+        headers=DEFAULT_HEADERS,
+    )
     session.url = (
         'Use self.get_response(url) for request tests or '
         'util methods for api tests!'
     )
-    if request.cls.proxies:
-        session.proxies.update(request.cls.proxies)
     request.cls.session = session
     request.config.get_fail_debug = _get_fail_debug
     request.config.assertion_errors = request.cls.assertion_errors = []
     yield session
-    if session:
-        session.close()
     request.cls.xrequestid = None
 
 

{Promium-3.3.30 → Promium-3.4.0}/promium/test_case.py

@@ -3,7 +3,7 @@ import errno
 import os
 import signal
 import threading
-
+import urllib3
 import pytest
 import logging
 import traceback
@@ -42,6 +42,13 @@ DRIVERS = {
 MAX_LOAD_TIME = 10
 
 
+DEFAULT_HEADERS = {
+    "Accept-Encoding": 'gzip, deflate',
+    "Accept": "*/*",
+    "Connection": "keep-alive",
+}
+
+
 def timeout(seconds=5, error_message=os.strerror(errno.ETIME)):
     def decorator(func):
         def _handle_timeout(signum, frame):
@@ -200,37 +207,61 @@ class WebDriverTestCase(TestCase, WebDriverSoftAssertion):
 @pytest.mark.usefixtures("request_init")
 class RequestTestCase(TestCase, RequestSoftAssertion):
     session = None
-    proxies = {}
 
     def get_response(
         self, url, method="GET", timeout=10, cookies=None, **kwargs,
     ):
         self.session.url = url
         self.session.status_code = None
+        session = self.session
         request_cookies = {'xrequestid': self.xrequestid}
         if cookies:
             request_cookies.update(cookies)
+        cookies_str = '; '.join(
+            [f'{k}={v}' for k, v in request_cookies.items()]
+        )
+
+        if hasattr(self.session, 'session_cookie'):
+            cookies_str += f'; {self.session.session_cookie}'
+
+        if self.proxy_server and not hasattr(session, 'proxy_override_session'):
+            session = urllib3.ProxyManager(
+                proxy_url=f"http://{self.proxy_server}",
+                cert_reqs=False,
+                timeout=15,
+            )
+            session.proxy_override_session = True
+
+        headers = DEFAULT_HEADERS
+        headers['Cookie'] = cookies_str
+        if new_headers := kwargs.pop('headers', None):
+            headers.update(new_headers)
 
         for i in range(1, 3):
-            response = self.session.request(
-                method=method,
+            response = session.request(
                 url=url,
-                timeout=timeout,
-                verify=False,
-                cookies=request_cookies,
-                hooks=dict(response=request_logging),
+                method=method,
+                headers=headers,
+                timeout=urllib3.Timeout(
+                    connect=5.0,
+                    read=float(timeout),
+                    total=float(timeout),
+                ),
                 **kwargs,
             )
-            self.session.status_code = response.status_code
+            request_logging(response, url, method, **kwargs)
+            self.session.status_code = response.status
+            response.status_code = response.status
             if (
-                    response.status_code in [502, 503, 504] and
-                    response.request.method in ["POST", "GET"]
+                    response.status in [502, 503, 504] and
+                    method in ["POST", "GET"]
             ):
                 log.warning(
                     f'[Request Retry]: attempt:{i}, '
-                    f'status: {response.status_code}'
+                    f'status: {response.status}'
                 )
             else:
+                self.session.session_cookie = response.headers.get('set-cookie')
                 break
 
         return response

{Promium-3.3.30 → Promium-3.4.0}/promium/waits.py

@@ -1,5 +1,5 @@
 import logging
-import requests
+import urllib3
 import time
 
 from selenium.webdriver.support.ui import WebDriverWait
@@ -18,6 +18,17 @@ log = logging.getLogger(__name__)
 NORMAL_LOAD_TIME = 10
 
 
+http = urllib3.PoolManager(
+    cert_reqs=False,
+    timeout=10,
+    headers={
+        "Accept-Encoding": 'gzip, deflate',
+        "Accept": "*/*",
+        "Connection": "keep-alive",
+    },
+)
+
+
 def enable_jquery(driver):
     """Enables jquery"""
     driver.execute_script(
@@ -220,10 +231,12 @@ def wait_for_status_code(url, status_code=200, tries=10, allow_redirects=True):
     """Waits for status code"""
     current_status = None
     for _ in range(tries):
-        response = requests.get(
-            url, allow_redirects=allow_redirects, verify=False
+        response = http.request(
+            url=url,
+            method='GET',
+            redirect=allow_redirects,
         )
-        current_status = response.status_code
+        current_status = response.status
         if current_status == status_code:
             return response
         time.sleep(1)

{Promium-3.3.30 → Promium-3.4.0}/setup.py

@@ -6,7 +6,7 @@ from setuptools import setup, find_packages
 REQUIREMENTS = [
     'six>=1.10.0',
     'json_checker>=1.2.1',
-    'requests>=2.10.0',
+    'urllib3>=2.0.2',
     'py>=1.5.2',
     'pytest>=5.0.0',
     'pytest_rerunfailures>=4.1.0',
@@ -19,7 +19,7 @@ REQUIREMENTS = [
 
 setup(
     name='Promium',
-    version='3.3.30',
+    version='3.4.0',
     install_requires=REQUIREMENTS,
     author='Denis Korytkin, Nataliia Guieva, '
            'Roman Zaporozhets, Vladimir Kritov, '

{Promium-3.3.30 → Promium-3.4.0}/tests/test_requests.py

@@ -9,7 +9,7 @@ class TestMainPage(RequestTestCase):
     test_case_url = 'some url with test case'
 
     def test_google_search_block(self):
-        page_text = self.get_response('https://google.com.ua').text
+        page_text = self.get_response('https://google.com.ua').data
         soup = BeautifulSoup(page_text, "html.parser")
 
         search_input = soup.find(attrs={'name': 'q'})