Merge lp:~elopio/selenium-simple-test/multiple-classes into lp:selenium-simple-test

[Leo Arias]

Fix get_elements action to handle multiple class values. (LP: #860997)

Fix get_elements action to handle multiple class values. (LP: #860997)
This solves the problem on the failing get_element.py selftests, so uncommented them

[Corey Goldberg (coreygoldberg)]

nice.
thanks for getting all get_elements tests to pass!

review: Approve

=== modified file 'src/sst/actions.py'
--- src/sst/actions.py	2011-09-27 14:00:36 +0000
+++ src/sst/actions.py	2011-09-27 23:54:24 +0000
@@ -757,17 +757,18 @@
 
     You can specify as many or as few attributes as you like."""
     selector_string = ''
-    if tag is not None:
+    if tag:
         selector_string = tag
-    if css_class is not None:
-        selector_string += ('.%s' % (css_class,))
-    if id is not None:
-        selector_string += ('#%s' % (id,))
+    if css_class:
+        css_class_selector = css_class.strip().replace(' ', '.')
+        selector_string += ('.%s' % css_class_selector)
+    if id:
+        selector_string += ('#%s' % id)
 
     selector_string += ''.join(['[%s=%r]' % (key, value) for
                                 key, value in kwargs.items()])
     try:
-        if text is not None and not selector_string:
+        if text and not selector_string:
             elems = browser.find_elements_by_xpath('//*[text() = %r]' % text)
         else:
             if not selector_string:
@@ -778,11 +779,11 @@
         msg = 'Element not found: %s' % e
         _raise(msg)
 
-    if text is not None:
+    if text:
         # if text was specified, filter elements
         elems = [element for element in elems if _check_text(element, text)]
 
-    if len(elems) == 0:
+    if not elems:
         msg = 'Could not identify elements: 0 elements found'
         _raise(msg)
 

=== modified file 'src/sst/selftests/get_element.py'
--- src/sst/selftests/get_element.py	2011-09-24 16:39:47 +0000
+++ src/sst/selftests/get_element.py	2011-09-27 23:54:24 +0000
@@ -19,12 +19,12 @@
 text_is(elem, 'link to longscroll page')
 
 # unique id + non-unique css_class
-#elem = get_element(id='longscroll_link', css_class='link class 1')  # failing!
-#text_is(elem, 'link to longscroll page')
+elem = get_element(id='longscroll_link', css_class='link class a1')
+text_is(elem, 'link to longscroll page')
 
 # tag + unique id + non-unique css_class
-#elem = get_element(tag='a', id='longscroll_link', css_class='link class 1')  # failing!
-#text_is(elem, 'link to longscroll page')
+elem = get_element(tag='a', id='longscroll_link', css_class='link class a1')
+text_is(elem, 'link to longscroll page')
 
 # unique id + tag
 elem = get_element(tag='a', id='longscroll_link')
@@ -89,5 +89,3 @@
 is_radio(elem)
 elem = get_element(type='radio', name='radio_with_id', checked='1')
 is_radio(elem)
-
-

=== modified file 'src/testproject/templates/begin.html'
--- src/testproject/templates/begin.html	2011-08-11 18:20:48 +0000
+++ src/testproject/templates/begin.html	2011-09-27 23:54:24 +0000
@@ -12,7 +12,7 @@
   <p class="some_class">More text</p>
   <p class="some_class">And yet more</p>
 
-  <a class="link class 1" id="the_band_link" href="/">Here is a link</a>
+  <a class="link class a1" id="the_band_link" href="/">Here is a link</a>
 
   <form method="post" action="/begin">
 

=== modified file 'src/testproject/templates/index.html'
--- src/testproject/templates/index.html	2011-09-27 04:21:51 +0000
+++ src/testproject/templates/index.html	2011-09-27 23:54:24 +0000
@@ -16,10 +16,10 @@
   <p class="some_class">More text</p>
   <p class="some_class">And yet more</p>
 
-  <a class="link class 1" id="the_band_link" href="/begin">Here is a link</a>
+  <a class="link class a1" id="the_band_link" href="/begin">Here is a link</a>
   
   <div id="the_div">
-    <a class="link class 1" id="longscroll_link" name="longscroll", href="/longscroll">link to longscroll page</a>
+    <a class="link class a1" id="longscroll_link" name="longscroll", href="/longscroll">link to longscroll page</a>
   </div>
   
   <form method="post" action="/begin">

=== modified file 'src/testproject/templates/longscroll.html'
--- src/testproject/templates/longscroll.html	2011-09-19 14:59:27 +0000
+++ src/testproject/templates/longscroll.html	2011-09-27 23:54:24 +0000
@@ -11,7 +11,7 @@
   <p class="some_class">More text</p>
   <p class="some_class">And yet more</p>
 
-  <a class="link class 1" id="homepage_link_top" href="/">go to Homepage</a>
+  <a class="link class a1" id="homepage_link_top" href="/">go to Homepage</a>
   
   <form method="post" action="/begin">
     <div>
@@ -21,7 +21,7 @@
     <input type="submit" value="Begin" id="mainform" />
   </form>
   
-  <a class="link class 1" id="homepage_link_bottom" href="/">go to Homepage</a>
+  <a class="link class a1" id="homepage_link_bottom" href="/">go to Homepage</a>
 
 </body>
 </html>