Merge lp:~elopio/selenium-simple-test/is-displayed into lp:selenium-simple-test

[Leo Arias]

Added the element_is_displayed action (Fixes bug #860264)

Added the element_is_displayed action, that will raise an exception if the element is not displayed (LP: #860264)

[Corey Goldberg (coreygoldberg)]

wondering if "element_is_displayed(id_or_elem)" should be named "is_displayed(id_or_elem)" ?
what do you think about the naming?

otherwise, looks good!

[Corey Goldberg (coreygoldberg)]

I made the name change to "is_displayed(id_or_elem)" in my branch:
https://code.launchpad.net/~coreygoldberg/selenium-simple-test/new-is_displayed

I'll merge that branch with this one as a prerequisite.

review: Approve

=== modified file 'src/sst/actions.py'
--- src/sst/actions.py	2011-09-26 04:27:25 +0000
+++ src/sst/actions.py	2011-09-27 05:39:23 +0000
@@ -69,8 +69,8 @@
     'set_wait_timeout', 'get_argument', 'run_test', 'get_base_url',
     'end_test', 'skip', 'get_element_by_css', 'get_elements_by_css',
     'take_screenshot', 'debug', 'get_page_source', 'simulate_keys',
-    'element_click', 'get_element_by_xpath', 'get_elements_by_xpath',
-    'switch_to_window', 'switch_to_frame'
+    'element_is_displayed', 'element_click', 'get_element_by_xpath', 
+    'get_elements_by_xpath', 'switch_to_window', 'switch_to_frame'
 ]
 
 
@@ -433,6 +433,18 @@
         url_is(link_url)
 
 
+def element_is_displayed(id_or_elem):
+    """
+    Assert that the element is displayed. Takes an id or an element object. 
+    Raises a failure exception if the element specified doesn't exist or isn't
+    displayed. Returns the element if it is displayed."""
+    element = _get_elem(id_or_elem)
+    if not element.is_displayed():
+        message = 'Element is not displayed'
+        _raise(message)
+    return element
+
+
 def element_click(id_or_elem, wait=True):
     """
     Click on an element of any kind not specific to links or buttons.

=== added file 'src/sst/selftests/element_is_displayed.py'
--- src/sst/selftests/element_is_displayed.py	1970-01-01 00:00:00 +0000
+++ src/sst/selftests/element_is_displayed.py	2011-09-27 05:39:23 +0000
@@ -0,0 +1,10 @@
+import os
+from sst.actions import *
+
+"""Test the element_is_displayed action."""
+
+
+goto('/')
+
+element_is_displayed('select_with_id_1')
+fails(element_is_displayed, 'hidden_input')

=== modified file 'src/testproject/templates/index.html'
--- src/testproject/templates/index.html	2011-09-26 03:12:05 +0000
+++ src/testproject/templates/index.html	2011-09-27 05:39:23 +0000
@@ -138,6 +138,6 @@
   </form>
   
   <a id="popup_link" href="popup_with_frame.html" target="_NEW_WINDOW">Popup</a>
-  
+  <input type="hidden" id="hidden_input" />
 </body>
 </html>