Merge lp:~jaboing/selenium-simple-test/sst-window_index into lp:selenium-simple-test

[Julien Funk]

New index functionality for switch_to_window and new tests

Added index functionality to switch_to_window and updated / added tests

[Corey Goldberg (coreygoldberg)]

this branch is included with: https://code.launchpad.net/~coreygoldberg/selenium-simple-test/switch-window-refactor/+merge/79167

marking this MP as merged.

review: Approve

=== modified file 'src/sst/actions.py'
--- src/sst/actions.py	2011-10-06 19:48:04 +0000
+++ src/sst/actions.py	2011-10-07 20:56:35 +0000
@@ -71,7 +71,7 @@
     'take_screenshot', 'debug', 'get_page_source', 'simulate_keys',
     'is_displayed', 'element_click', 'get_element_by_xpath',
     'get_elements_by_xpath', 'switch_to_window', 'switch_to_frame',
-    'alert_accept', 'alert_dismiss']
+    'alert_accept', 'alert_dismiss',]
 
 
 browser = None
@@ -903,20 +903,32 @@
     return browser.page_source
 
 
-def switch_to_window(window_name=None):
+def switch_to_window(window_name=None, index=None):
     """
     Switch focus to the specified window.
 
     if no window is given, switch focus to the default window."""
-    if window_name is None:
+    if window_name is None and index is None:
         _print('Switching to default window')
         browser.switch_to_window('')
-    else:
+    elif window_name is not None:
         try:
+            _print('Switching to ' + window_name + ' window')
             browser.switch_to_window(window_name)
         except NoSuchWindowException:
             msg = 'Could not find window: %r' % window_name
             _raise(msg)
+    else:
+        try:
+            window_list = browser.window_handles
+            if len(window_list) <= index:
+                msg = 'Index of %r is greater than the number of available windows.' % index
+                _raise(msg)
+            _print('Switching to ' + window_list[index] + ' window')
+            browser.switch_to_window(window_list[index])
+        except NoSuchWindowException:
+            msg = 'Could not find window: %r' % window_list[index]
+            _raise(msg)
 
 
 def switch_to_frame(index_or_name=None):

=== modified file 'src/sst/selftests/switch_to_window.py'
--- src/sst/selftests/switch_to_window.py	2011-09-25 20:01:09 +0000
+++ src/sst/selftests/switch_to_window.py	2011-10-07 20:56:35 +0000
@@ -5,7 +5,7 @@
 link_click('popup_link')
 
 # switch to new window/tab
-switch_to_window('_NEW_WINDOW')
+switch_to_window(window_name='_NEW_WINDOW')
 title_is('Popup Window')
 
 # switch back to default/main window/tab
@@ -21,7 +21,15 @@
 text_is(elem, 'Popup text here')
 
 # switch back to default/main window/tab
-switch_to_window('')
+switch_to_window(window_name='')
+title_is('The Page Title')
+
+# switch to new window/tab using index
+switch_to_window(index=1)
+title_is('Popup Window')
+
+# switch back to default/main window using index
+switch_to_window(index=0)
 title_is('The Page Title')
 
 # fails when the window name does not exist
@@ -30,5 +38,8 @@
 # fails when the window name does not exist
 fails(switch_to_window, 'not_a_window')
 
+# fails when the window index does not exist
+fails(switch_to_window, index=2)
+
 # verify we are still back on main window
 title_is('The Page Title')