selenium-query 0.3.0__tar.gz → 0.3.2__tar.gz

{selenium_query-0.3.0 → selenium_query-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: selenium-query
-Version: 0.3.0
+Version: 0.3.2
 Summary: Python equivalent of jQuery, to write selenium tests.
 License: GPL-3.0-or-later
 Author: Frédéric Zinelli
@@ -639,14 +639,12 @@ The important relationship is:
 
 ```text
 BaseSeleniumPage
-        │
-        ├── driver
-        ├── waiter
-        └── Getter
-              │
-              └── find(...)
-                    │
-                 query
+    ├── driver
+    ├── waiter
+    └── Getter
+            └── find(...)
+                │
+                query
 ```
 
 In normal user code, the query API starts with:
@@ -703,13 +701,11 @@ The expected model is:
 
 ```text
 load_url()
-    │
     ├── load the URL
     ├── wait until the page is ready
     └── gather shared page data
 
 data()
-    │
     └── build data specific to the subclass
 ```
 
@@ -1261,7 +1257,6 @@ Both make also use of the [`pmt-tools`](https://gitlab.com/frederic-zinelli/pmt_
 Selenium environment
         ↓
   BaseSeleniumPage
-        │
         ├── load URL
         ├── wait for readiness
         ├── gather data

{selenium_query-0.3.0 → selenium_query-0.3.2}/README.md

@@ -621,14 +621,12 @@ The important relationship is:
 
 ```text
 BaseSeleniumPage
-        │
-        ├── driver
-        ├── waiter
-        └── Getter
-              │
-              └── find(...)
-                    │
-                 query
+    ├── driver
+    ├── waiter
+    └── Getter
+            └── find(...)
+                │
+                query
 ```
 
 In normal user code, the query API starts with:
@@ -685,13 +683,11 @@ The expected model is:
 
 ```text
 load_url()
-    │
     ├── load the URL
     ├── wait until the page is ready
     └── gather shared page data
 
 data()
-    │
     └── build data specific to the subclass
 ```
 
@@ -1243,7 +1239,6 @@ Both make also use of the [`pmt-tools`](https://gitlab.com/frederic-zinelli/pmt_
 Selenium environment
         ↓
   BaseSeleniumPage
-        │
         ├── load URL
         ├── wait for readiness
         ├── gather data

{selenium_query-0.3.0 → selenium_query-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "selenium-query"
-version = "0.3.0"
+version = "0.3.2"
 description = "Python equivalent of jQuery, to write selenium tests."
 license = { text = "GPL-3.0-or-later" }
 authors = [

{selenium_query-0.3.0 → selenium_query-0.3.2}/selenium_query/__init__.py

@@ -622,14 +622,12 @@ The important relationship is:
 
 ```text
 BaseSeleniumPage
-        │
-        ├── driver
-        ├── waiter
-        └── Getter
-              │
-              └── find(...)
-                    │
-                 query
+    ├── driver
+    ├── waiter
+    └── Getter
+            └── find(...)
+                │
+                query
 ```
 
 In normal user code, the query API starts with:
@@ -686,13 +684,11 @@ The expected model is:
 
 ```text
 load_url()
-    │
     ├── load the URL
     ├── wait until the page is ready
     └── gather shared page data
 
 data()
-    │
     └── build data specific to the subclass
 ```
 
@@ -1244,7 +1240,6 @@ Both make also use of the [`pmt-tools`](https://gitlab.com/frederic-zinelli/pmt_
 Selenium environment
         ↓
   BaseSeleniumPage
-        │
         ├── load URL
         ├── wait for readiness
         ├── gather data
@@ -1279,4 +1274,4 @@ from ._filter_getter import FilterGetter
 from ._order_getter import OrderGetter
 from ._mapper_getter import MapperGetter
 from ._negation_transmitter import NotTransmitter
-from .base_selenium_page import BaseSeleniumPage
+from .base_selenium_page import BaseSeleniumPage, depends_on

selenium_query-0.3.2/selenium_query/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.3.2"

{selenium_query-0.3.0 → selenium_query-0.3.2}/selenium_query/_basics/base_getter.py

@@ -140,25 +140,24 @@ class BaseGetter:
         return getattr(self.driver, method)(code, *args)
 
 
-    def wait_for_element(self, css_selector, as_=""):
+    def wait_for_element(self, css_selector, as_="", *, timeout=None, error=False):
         if self._actions:
             raise ValueError(f"Cannot use `wait_until(...)` on objects with defined ActionChains.")
 
-        date = None
-        delta = dt.timedelta(seconds=0.05)
+        timeout = timeout and dt.datetime.now() + dt.timedelta(seconds=timeout)
 
         def finder(_):
-            nonlocal date
+            if timeout and dt.datetime.now() > timeout:
+                if error:
+                    raise TimeoutError()
+                return TimeoutError()   # truthy!
 
             elt = self.find(css_selector, in_page=True, as_=as_)
             found = elt.exists() and elt
             if found:
-                if not date:
-                    date = dt.datetime.now()
-                if dt.datetime.now() - date > delta:
-                    return found
+                elt.pause(0.05).go
+                return elt
             return False
-
         return self.waiter.until(finder)
 
 

{selenium_query-0.3.0 → selenium_query-0.3.2}/selenium_query/base_selenium_page.py

@@ -28,6 +28,23 @@ from selenium_query import Getter
 
 
 
+def depends_on(src_method:Callable, *, pass_args=False):
+    """
+    If @pass_args is True, all arguments of the current method will also be passed to the method
+    it depends on (might be useful for tests with fixtures or dependencies).
+    """
+    def decorator(method):
+        @wraps(method)
+        def wrapper(self:BaseSeleniumPage, *a, **kw):
+            if src_method.__name__ not in self._methods_run:
+                if pass_args:
+                    src_method(self, *a, **kw)
+                else:
+                    src_method(self)
+            return method(self, *a, **kw)
+        return wrapper
+    return decorator
+
 
 
 
@@ -100,6 +117,10 @@ class BaseSeleniumPage:
     #----------------------------------------------------------------------------------------------
 
 
+    depends_on = staticmethod(depends_on)
+    # Relay to make it possible to use/access it through the class
+
+
     def __init_subclass__(cls):
         """
         Wrap all tests methods with an automatic "method execution tracking logistic", to know what
@@ -130,26 +151,9 @@ class BaseSeleniumPage:
                 setattr(cls, name, track_run_methods(method))
 
 
-    @staticmethod
-    def depends_on(src_method:Callable, *, pass_args=False):
-        """
-        If @pass_args is True, all arguments of the current method will also be passed to the method
-        it depends on (might be useful for tests with fixtures or dependencies).
-        """
-        def decorator(method):
-            @wraps(method)
-            def wrapper(self:BaseSeleniumPage, *a, **kw):
-                if src_method.__name__ not in self._methods_run:
-                    if pass_args:
-                        src_method(self, *a, **kw)
-                    else:
-                        src_method(self)
-                return method(self, *a, **kw)
-            return wrapper
-        return decorator
-
     #----------------------------------------------------------------------------------------------
 
+
     #@Fixture(scope="module", autouse=True)
     @classmethod
     def load_url(cls, clean_cache, selenium_env: Tuple[str,str,WebDriver]):
@@ -258,8 +262,8 @@ class BaseSeleniumPage:
 
 
     @classmethod
-    def wait_for_element(cls, css_selector:str):
-        return cls._getter.wait_for_element(css_selector)
+    def wait_for_element(cls, css_selector:str, as_="", *, timeout=None, error=False):
+        return cls._getter.wait_for_element(css_selector, as_=as_, timeout=timeout, error=error)
 
 
     @classmethod

selenium_query-0.3.0/selenium_query/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.3.0"