Promium 3.7.7__tar.gz → 3.7.8__tar.gz

{promium-3.7.7 → promium-3.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.7.7
+Version: 3.7.8
 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.7.7 → promium-3.7.8}/Promium.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.7.7
+Version: 3.7.8
 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.7.7 → promium-3.7.8}/promium/_diag.py

@@ -81,16 +81,14 @@ def _user_callsite() -> tuple[str, int] | None:
         stack = inspect.stack()
     except Exception:
         return None
+    except_list = []
     for f in stack:
         fn = f.filename.replace("\\", "/")
         if "/tests/" in fn:
-            return (f.filename, f.lineno)
-    for f in stack:
-        fn = f.filename.replace("\\", "/")
-        if "/promium/" in fn or "site-packages/" in fn or "/_pytest/" in fn:
-            continue
-        return (f.filename, f.lineno)
-    return None
+            if "/promium/" in fn or "site-packages/" in fn or "/_pytest/" in fn:
+                continue
+            except_list.append((f.filename, f.lineno))
+    return except_list
 
 
 def _dedup_consecutive(items: list[str]) -> list[str]:
@@ -308,16 +306,17 @@ def build_digest(
         blocks.append("— Actions: \n" + actions)
 
     if SHOW_CALLSITE:
-        cs = _user_callsite()
-        if cs:
-            abs_path, line_no = cs
+        trace_lines = []
+        for i, (abs_path, line_no) in enumerate(_user_callsite()[::-1]):
+            indent = " " * (i * 4)
             rel = _rel(abs_path)
-            lines = [f"↳ at {rel}:{line_no}"]
+            lines = [f"{indent}↳ at {rel}:{line_no}"]
             if SHOW_CALLSITE_CODELINE:
                 src = _read_source_line(abs_path, line_no, CALLSITE_CODE_MAXLEN)
                 if src:
-                    lines.append(" " * CALLSITE_CODE_INDENT + src)
-            blocks.append("\n".join(lines))
+                    lines.append(f"{indent}{' ' * CALLSITE_CODE_INDENT}{src}")
+            trace_lines.append("\n".join(lines))
+        blocks.append("\n".join(trace_lines))
 
     if origin and origin[0]:
         blocks.append(f"↳ locator at {_rel(origin[0])}:{origin[1] or '?'}")

{promium-3.7.7 → promium-3.7.8}/promium/assertions.py

@@ -103,13 +103,14 @@ class BaseSoftAssertion:
 
     def _callsite_line(self) -> str:
         """Return callsite line in format ↳ at path:lineno."""
-        for frame in inspect.stack()[2:]:
+        return_value = ""
+        for frame in inspect.stack()[2:][::-1]:
             fn = frame.filename.replace("\\", "/")
-            if "/site-packages/" in fn:
+            if "/promium/" in fn or "site-packages/" in fn or "/_pytest/" in fn:
                 continue
-            return f"↳ at {self._relpath(fn)}:{frame.lineno}"
-        f = inspect.stack()[2]
-        return f"↳ at {self._relpath(f.filename)}:{f.lineno}"
+            if "/tests/" in fn:
+                return_value += f"↳ at {self._relpath(fn)}:{frame.lineno}\n"
+        return return_value
 
     def _format_error(self, error_msg: str, *, with_screen: bool) -> str:
         """Build final error text."""

{promium-3.7.7 → promium-3.7.8}/promium/base.py

@@ -187,7 +187,10 @@ class Page:
         self, driver: WebDriver, monkeypatch: pytest.MonkeyPatch = None
     ) -> None:
         self._driver = driver
-        self.previous_window_handle = self.driver.current_window_handle
+        if not hasattr(self.driver, "previous_window_handle"):
+            self.driver.previous_window_handle = (
+                self.driver.current_window_handle
+            )
         self.monkeypatch = monkeypatch
 
     @property
@@ -292,23 +295,23 @@ class Page:
     def switch_to_tab(self) -> None:
         """Switch to a newly opened browser tab."""
         new_window = wait_until_new_window_is_opened(
-            self.driver, self.previous_window_handle
+            self.driver, self.driver.previous_window_handle
         )
         switch_to_window(self.driver, new_window)
 
     def switch_previous_tab(self) -> None:
         """Switch back to the previously active tab."""
-        switch_to_window(self.driver, self.previous_window_handle)
+        switch_to_window(self.driver, self.driver.previous_window_handle)
 
     def open_tab(self) -> None:
         """Open new tab and switch to it."""
         self.driver.execute_script("window.open();")
-        switch_to_window(self.driver, self.previous_window_handle)
+        self.switch_to_tab()
 
     def close_tab(self) -> None:
         """Close current tab and switch to the previously tab."""
         self.driver.close()
-        switch_to_window(self.driver, self.previous_window_handle)
+        self.switch_previous_tab()
 
     def scroll_to_bottom(self) -> None:
         """Scroll to the bottom of the page."""
@@ -1162,7 +1165,7 @@ class ElementBase(Base):
             )
             digest = build_digest(
                 self.driver,
-                title="Click failed, some covers",
+                title="Click failed, something is covering",
                 locator=css,
                 condition="webelement.click()",
                 css_for_probe=css_probe,

{promium-3.7.7 → promium-3.7.8}/promium/expected_conditions.py

@@ -1,4 +1,4 @@
-from typing import Any, NoReturn
+from typing import Any
 
 from promium.exceptions import PromiumException
 
@@ -8,10 +8,10 @@ class BaseElementConditionWithRefresh:
         self.element = element
         self.with_refresh = with_refresh
 
-    def call_method(self) -> NoReturn:
+    def call_method(self) -> Any:
         raise PromiumException("Not implemented")
 
-    def __call__(self, driver: Any) -> bool:
+    def __call__(self, driver: Any) -> Any:
         if self.with_refresh:
             driver.refresh()
         return self.call_method()

{promium-3.7.7 → promium-3.7.8}/setup.py

@@ -19,7 +19,7 @@ LONG_DESCRIPTION = Path("README.rst").read_text(encoding="utf-8")
 
 setup(
     name="Promium",
-    version="3.7.7",
+    version="3.7.8",
     install_requires=REQUIREMENTS,
     author=(
         "Denis Korytkin, Nataliia Guieva, "