selenium-query 0.3.3__tar.gz → 0.4.0__tar.gz

{selenium_query-0.3.3 → selenium_query-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: selenium-query
-Version: 0.3.3
+Version: 0.4.0
 Summary: Python equivalent of jQuery, to write selenium tests.
 License: GPL-3.0-or-later
 Author: Frédéric Zinelli

{selenium_query-0.3.3 → selenium_query-0.4.0}/pyproject.toml

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

selenium_query-0.4.0/selenium_query/__version__.py

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

{selenium_query-0.3.3 → selenium_query-0.4.0}/selenium_query/_basics/generic_value_getter.py

@@ -94,7 +94,15 @@ class ComparerGetter(BaseGetter):
 
     def css(self, dct=None, **kwargs:Any):
         expectations = self._merge_args(dct,kwargs).items()
-        return self._check_elements(expectations, WebElement.value_of_css_property)
+        return self._check_elements(expectations, self._get_computed_css)
+
+    def _get_computed_css(self, element:WebElement, name:str):
+        """ FIX non FF browser: computed css properties are not accessible with value_of_css_property... """
+        if not name.startswith('--') or self.driver.capabilities['browserName'] == 'firefox':
+            return element.value_of_css_property(name)
+        return self.run_js(
+            f"return getComputedStyle(arguments[0]).getPropertyValue({name!r})", element
+        )
 
     def data(self, dct=None, **kwargs:Any):
         expectations = {'data-'+s: v for s,v in self._merge_args(dct,kwargs).items()}

{selenium_query-0.3.3 → selenium_query-0.4.0}/selenium_query/base_selenium_page.py

@@ -15,10 +15,11 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
-
+import datetime as dt
 from functools import wraps
 from typing import Callable, ClassVar, Tuple, Union, Optional
 
+from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver.common.alert import Alert
 from selenium.webdriver.remote.webdriver import WebDriver
 from selenium.webdriver.support.wait import WebDriverWait
@@ -88,6 +89,8 @@ class BaseSeleniumPage:
     _getter: ClassVar[Getter]
     _waiter: ClassVar[WebDriverWait]
 
+    is_firefox: ClassVar[bool]
+
 
     #----------------------------------------------------------------------------------------------
 
@@ -189,7 +192,7 @@ class BaseSeleniumPage:
 
         if url == cls._LAST_LOADED_PAGE:
             return
-
+        BaseSeleniumPage.is_firefox = driver.capabilities['browserName'] == 'firefox'
         BaseSeleniumPage._LAST_LOADED_PAGE = url
         BaseSeleniumPage.driver  = driver
         BaseSeleniumPage._waiter = WebDriverWait(driver, 25, poll_frequency=0.2)
@@ -260,6 +263,20 @@ class BaseSeleniumPage:
         return cls._waiter.until(lambda driver: driver.switch_to.alert)
 
 
+    @classmethod
+    def safer_wait_for_alert(cls, timeout=10) -> Alert :
+        limit = dt.datetime.now() + dt.timedelta(seconds=timeout)
+        alert = None
+        while not alert and dt.datetime.now() <= limit:
+            try:
+                alert = cls.wait_until(lambda _: cls.driver.switch_to.alert)
+            except NoAlertPresentException:
+                continue
+        if not alert:
+            raise TimeoutError("Couldn't find the Alert in time...")
+        return alert
+
+
     @classmethod
     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)
@@ -292,8 +309,10 @@ class BaseSeleniumPage:
             return False
         else:
             return cls.page_is_ready(driver)
+
     _page_with_alert_is_ready = page_with_alert_is_ready    # alias for backward compatibility
 
+
     @classmethod
     def run_js(cls, code:str, *args, async_=False, with_promise=True):
         """

selenium_query-0.3.3/selenium_query/__version__.py

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