Fix "None" in wait causing incorrect tests

Author: TillerBurr

dash/testing/wait.py

@@ -62,9 +62,10 @@ def __call__(self, driver):
         try:
             elem = driver.find_element(By.CSS_SELECTOR, self.selector)
             logger.debug("contains text {%s} => expected %s", elem.text, self.text)
-            return self.text in str(elem.text) or self.text in str(
-                elem.get_attribute("value")
-            )
+            if value := elem.get_attribute("value") is not None:
+                return self.text in str(elem.text) or self.text in str(value)
+            else:
+                return self.text in str(elem.text)
         except WebDriverException:
             return False
 
@@ -107,10 +108,10 @@ def __call__(self, driver):
         try:
             elem = self._get_element(driver)
             logger.debug("text to equal {%s} => expected %s", elem.text, self.text)
-            return (
-                str(elem.text) == self.text
-                or str(elem.get_attribute("value")) == self.text
-            )
+            if value := elem.get_attribute("value") is not None:
+                return str(elem.text) == self.text or str(value) == self.text
+            else:
+                return str(elem.text) == self.text
         except WebDriverException:
             return False
 

tests/integration/test_duo.py

@@ -14,6 +14,11 @@ def test_duo001_wait_for_text_error(dash_duo):
 
     assert err.value.args[0] == "text -> Invalid not found within 1.0s, found: Content"
 
+    with pytest.raises(TimeoutException) as err:
+        dash_duo.wait_for_text_to_equal("#content", "None", timeout=1.0)
+
+    assert err.value.args[0] == "text -> None not found within 1.0s, found: Content"
+
     with pytest.raises(TimeoutException) as err:
         dash_duo.wait_for_text_to_equal("#none", "None", timeout=1.0)
 
@@ -27,6 +32,14 @@ def test_duo001_wait_for_text_error(dash_duo):
         == "text -> invalid not found inside element within 1.0s, found: Content"
     )
 
+    with pytest.raises(TimeoutException) as err:
+        dash_duo.wait_for_contains_text("#content", "None", timeout=1.0)
+
+    assert (
+        err.value.args[0]
+        == "text -> None not found inside element within 1.0s, found: Content"
+    )
+
     with pytest.raises(TimeoutException) as err:
         dash_duo.wait_for_contains_text("#none", "none", timeout=1.0)