Promium 3.5.0__tar.gz → 3.5.2__tar.gz

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

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

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

@@ -14,7 +14,6 @@ from selenium.common.exceptions import (
     NoSuchElementException,
     TimeoutException
 )
-from selenium.webdriver.remote.webdriver import WebDriver
 from selenium.webdriver.remote.webelement import WebElement
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.action_chains import ActionChains
@@ -103,13 +102,14 @@ def highlight_element(func):
     return wrapper
 
 
-def get_web_driver(driver):  # TODO: delete
-    if isinstance(driver, WebDriver):
-        return driver
-    elif isinstance(driver, WebElement):
-        return get_web_driver(driver._parent)
-    error = 'Wrong driver instance. Supported WebDriver and WebElement only'
-    raise PromiumException(error)
+def text_to_be_present_in_element(element, text_):
+    def _predicate(driver):
+        try:
+            return text_ in element.lookup().text
+        except StaleElementReferenceException:
+            return False
+
+    return _predicate
 
 
 class Page(object):
@@ -133,12 +133,14 @@ class Page(object):
         if not self.url:
             raise PromiumException("Can't open page without url")
         start = time.time()
+        url = self.url.format(**kwargs)
+        log.info(f'Open Page: {url}')
         try:
-            self.driver.get(self.url.format(**kwargs))
+            self.driver.get(url)
         except TimeoutException:
             log.error(f"[PROMIUM] Page load time: {time.time() - start}")
             raise
-        return self.url.format(**kwargs)
+        return url
 
     @logger_for_loading_page
     def refresh(self):
@@ -746,11 +748,10 @@ class Element(ElementBase):
         )
 
     def wait_for_text_present(self, text):
-        params = (self.by, self.locator)
         return wait_until(
             driver=self.driver,
             seconds=10,
-            expression=EC.text_to_be_present_in_element(params, text),
+            expression=text_to_be_present_in_element(self, text),
             msg=f"Text: {text}, does not appear after 10 seconds"
         )
 

{Promium-3.5.0 → Promium-3.5.2}/promium/test_case.py

@@ -199,6 +199,7 @@ class WebDriverTestCase(TestCase, WebDriverSoftAssertion):
 
     @logger_for_loading_page
     def get_url(self, url, cleanup=True):
+        log.info(f'Open Page: {url}')
         self.driver.get(url)
         if cleanup:
             with contextlib.suppress(WebDriverException):
@@ -272,7 +273,10 @@ class RequestTestCase(TestCase, RequestSoftAssertion):
 
         # fix display full url
         parser = urllib.parse.urlparse(url)
-        if not response.url.startswith('http') and 'http' in parser.scheme:
-            response.url = f'{parser.scheme}://{parser.netloc}{response.url}'
+        if hasattr(response, 'url') and response.url:
+            if not response.url.startswith('http') and 'http' in parser.scheme:
+                response.url = (
+                    f'{parser.scheme}://{parser.netloc}{response.url}'
+                )
 
         return response

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

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