Add 'Wait Until Page Not Contains Element' -keyword

molsky · molsky · commit e5ca1534e0b6 · 2015-04-13T13:00:27.000+03:00
diff --git a/src/Selenium2Library/keywords/_waiting.py b/src/Selenium2Library/keywords/_waiting.py
@@ -62,6 +62,27 @@ def wait_until_page_contains_element(self, locator, timeout=None, error=None):
             error = "Element '%s' did not appear in <TIMEOUT>" % locator
         self._wait_until(timeout, error, self._is_element_present, locator)
 
+    def wait_until_page_not_contains_element(self, locator, timeout=None, error=None):
+        """Waits until element specified with `locator` disappears from current page.
+
+        Fails if `timeout` expires before the element disappears. See
+        `introduction` for more information about `timeout` and its
+        default value.
+
+        `error` can be used to override the default error message.
+
+        See also `Wait Until Page Contains`, `Wait For Condition`,
+        `Wait Until Element Is Visible` and BuiltIn keyword `Wait Until
+        Keyword Succeeds`.
+        """
+        def check_present():
+            present = self._is_element_present(locator)
+            if not present:
+                return
+            else:
+                return error or "Element '%s' did not disappear in %s" % (locator, self._format_timeout(timeout))
+        self._wait_until_no_error(timeout, check_present)
+
     def wait_until_element_is_visible(self, locator, timeout=None, error=None):
         """Waits until element specified with `locator` is visible.
 
@@ -154,4 +175,4 @@ def _wait_until_no_error(self, timeout, wait_func, *args):
 
     def _format_timeout(self, timeout):
         timeout = robot.utils.timestr_to_secs(timeout) if timeout is not None else self._timeout_in_secs
-        return robot.utils.secs_to_timestr(timeout)
+        return robot.utils.secs_to_timestr(timeout)
diff --git a/test/acceptance/keywords/waiting.txt b/test/acceptance/keywords/waiting.txt
@@ -17,6 +17,11 @@ Wait Until Page Contains Element
     Wait Until Page Contains Element  new div  2 seconds
     Run Keyword And Expect Error  Element '%cnon-existent' did not appear in 100 milliseconds  Wait Until Page Contains Element  %cnon-existent  0.1 seconds
 
+Wait Until Page Not Contains Element
+    [Documentation]  Tests also that format characters (e.g. %c) are handled correctly in error messages
+    Wait Until Page Not Contains Element  not_present  2 seconds
+    Run Keyword And Expect Error  Element 'content' did not disappear in 100 milliseconds  Wait Until Page Not Contains Element  content  0.1 seconds
+
 Wait Until Element Is Visible
     Run Keyword And Expect Error  Element 'hidden' was not visible in 100 milliseconds  Wait Until Element Is Visible  hidden  0.1
     Wait Until Element Is Visible  hidden  2 s
@@ -27,5 +32,4 @@ Wait Until Element Is Enabled
     Run Keyword And Expect Error  Element 'id=disabled' was not enabled in 100 milliseconds  Wait Until Element Is Enabled  id=disabled  0.1
     Wait Until Element Is Enabled  id=disabled  2 s
     Run Keyword And Expect Error  Element locator 'id=invalid' did not match any elements after 100 milliseconds  Wait Until Element Is Enabled  id=invalid  0.1
-    Run Keyword And Expect Error  User error message  Wait Until Element Is Enabled  id=invalid  0.1  User error message
-
+    Run Keyword And Expect Error  User error message  Wait Until Element Is Enabled  id=invalid  0.1  User error message
diff --git a/test/resources/html/javascript/delayed_events.html b/test/resources/html/javascript/delayed_events.html
@@ -4,6 +4,7 @@
     <script type="text/javascript">
     function modifyAfterDelay() {
         setTimeout('addElement()', 1000)
+        setTimeout('removeElement()', 1000)
         setTimeout('changeContent()', 1000)
         setTimeout('changeTitle()', 1000)
         setTimeout('unhideContent()', 1000)
@@ -16,7 +17,11 @@
       div.innerHTML = 'New Element'
       document.getElementById("container").appendChild(div)
     }
-    
+
+    function removeElement() {
+      document.getElementById("not_present").remove()
+    }
+
     function changeTitle() {
         document.title = "Changed"
         document.bgColor = '#FF00FF'
@@ -38,7 +43,8 @@
     <body onload="modifyAfterDelay()">
     <div id="content">This is content</div>
     <div id="container"></div>
+    <div id="not_present">Element that should disappear</div>
     <div id="hidden" style="display:none;">Inititally hidden content</div>
     <button id="disabled" disabled>Inititally disabled content</button>
     </body>
-</html>
+</html>
