merge with master

Author: zephraph

CHANGES.rst

@@ -3,6 +3,7 @@ Release Notes
 
 1.7 (unreleased)
 ----------------
+<<<<<<< HEAD
 - Added keyword 'List Windows' to return a list of all window handles.
   [divfor]
 
@@ -11,6 +12,8 @@ Release Notes
   by special locator 'new' (the simplified but less strict way).
   [divfor]
 
+=======
+>>>>>>> master
 - Added new keyword 'Wait Until Page Does Not Contain'.
   [deiga]
 

src/Selenium2Library/keywords/_waiting.py

@@ -45,6 +45,27 @@ def wait_until_page_contains(self, text, timeout=None, error=None):
             error = "Text '%s' did not appear in <TIMEOUT>" % text
         self._wait_until(timeout, error, self._is_text_present, text)
 
+    def wait_until_page_does_not_contain(self, text, timeout=None, error=None):
+        """Waits until `text` disappears from current page.
+
+        Fails if `timeout` expires before the `text` 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_text_present(text)
+            if not present:
+                return
+            else:
+                return error or "Text '%s' did not disappear in %s" % (text, self._format_timeout(timeout))
+        self._wait_until_no_error(timeout, check_present)
+
     def wait_until_page_contains_element(self, locator, timeout=None, error=None):
         """Waits until element specified with `locator` appears on current page.
 
@@ -155,6 +176,52 @@ def check_enabled():
 
         self._wait_until_no_error(timeout, check_enabled)
 
+    def wait_until_element_contains(self, locator, text, timeout=None, error=None):
+        """Waits until given element contains `text`.
+
+        Fails if `timeout` expires before the text appears on given element. 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 Until Page Contains Element`, `Wait For Condition`,
+        `Wait Until Element Is Visible` and BuiltIn keyword `Wait Until
+        Keyword Succeeds`.
+        """
+        element = self._element_find(locator, True, True)
+        def check_text():
+            actual = element.text
+            if text in actual:
+                return
+            else:
+                return error or "Text '%s' did not appear in %s to element '%s'. " \
+                            "Its text was '%s'." % (text, self._format_timeout(timeout), locator, actual)
+        self._wait_until_no_error(timeout, check_text)
+
+
+    def wait_until_element_does_not_contain(self, locator, text, timeout=None, error=None):
+        """Waits until given element does not contain `text`.
+
+        Fails if `timeout` expires before the text disappears from given element. 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 Until Page Contains Element`, `Wait For Condition`,
+        `Wait Until Element Is Visible` and BuiltIn keyword `Wait Until
+        Keyword Succeeds`.
+        """
+        element = self._element_find(locator, True, True)
+        def check_text():
+            actual = element.text
+            if not text in actual:
+                return
+            else:
+                return error or "Text '%s' did not disappear in %s from element '%s'." % (text, self._format_timeout(timeout), locator)
+        self._wait_until_no_error(timeout, check_text)
+
     # Private
 
     def _wait_until(self, timeout, error, function, *args):

test/acceptance/keywords/waiting.txt

@@ -12,6 +12,10 @@ Wait Until Page Contains
     Wait Until Page Contains  New Content  2 s
     Run Keyword And Expect Error  Text 'invalid' did not appear in 100 milliseconds  Wait Until Page Contains  invalid  0.1
 
+Wait Until Page Does Not Contain
+    Wait Until Page Does Not Contain  This is content  2 s
+    Run Keyword And Expect Error  Text 'Initially hidden' did not disappear in 100 milliseconds  Wait Until Page Does Not Contain  Initially hidden  0.1
+
 Wait Until Page Contains Element
     [Documentation]  Tests also that format characters (e.g. %c) are handled correctly in error messages
     Wait Until Page Contains Element  new div  2 seconds
@@ -34,3 +38,16 @@ Wait Until Element Is Enabled
     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
 
+Wait Until Element Contains
+    Run Keyword And Expect Error  Text 'New' did not appear in 100 milliseconds to element 'id=content'. Its text was 'This is content'.  Wait Until Element Contains  id=content  New  0.1
+    Wait Until Element Contains  content  New Content  2 s
+    Wait Until Element Contains  content  New  2 s
+    Run Keyword And Expect Error  User error message  Wait Until Element Contains  content  Error  0.1  User error message
+    Run Keyword And Expect Error  ValueError: Element locator 'id=invalid' did not match any elements.  Wait Until Element Contains  id=invalid  content  0.1
+
+Wait Until Element Does Not Contain
+    Run Keyword And Expect Error  Text 'This is' did not disappear in 100 milliseconds from element 'id=content'.  Wait Until Element Does Not Contain  id=content  This is  0.1
+    Wait Until Element Does Not Contain  content  This is  2 s
+    Wait Until Element Does Not Contain  id=content  content  2 s
+    Run Keyword And Expect Error  User error message  Wait Until Element Does Not Contain  content  New Content  0.1  User error message
+

test/resources/html/javascript/delayed_events.html

@@ -44,7 +44,7 @@
     <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>
+    <div id="hidden" style="display:none;">Initially hidden content</div>
+    <button id="disabled" disabled>Initially disabled content</button>
     </body>
 </html>

test/resources/html/jquery.html

@@ -2,7 +2,7 @@
   <head>
     <title>(root)/links.html</title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <script src="http://code.jquery.com/jquery-1.9.1.min.js" type="text/javascript"></script>
+    <script src="javascript/jquery.js" type="text/javascript"></script>
   </head>
   <body>
     <div id="div_id">
@@ -23,7 +23,7 @@
       	Link with whitespace
       </a><br/>
       <a href="target/third.html">
-      	Link with 
+      	Link with
       	whitespace   within
       </a><br/>
       <a href="target/first.html" id="bold_id"><b>Link with bolded text</b></a>