Merge pull request #375 from molsky/wait_until_page_not_contains_element2

zephraph · zephraph · commit e85fcd73cd14 · 2015-05-06T14:10:56.000-05:00
Add 'Wait Until Page Does Not Contain Element' keyword
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_does_not_contain_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.
 
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 Does Not Contain Element
+    [Documentation]  Tests also that format characters (e.g. %c) are handled correctly in error messages
+    Wait Until Page Does Not Contain Element  not_present  2 seconds
+    Run Keyword And Expect Error  Element 'content' did not disappear in 100 milliseconds  Wait Until Page Does Not Contain 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
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>
