[Checkins] SVN: gocept.selenium/trunk/src/gocept/selenium/ allow for omitting the window ID when addressing pop-up windows

[Thomas Lotze]

Log message for revision 109910:
  allow for omitting the window ID when addressing pop-up windows

Changed:
  U   gocept.selenium/trunk/src/gocept/selenium/selenese.py
  U   gocept.selenium/trunk/src/gocept/selenium/ztk/tests/test_selenese.py

-=-
Modified: gocept.selenium/trunk/src/gocept/selenium/selenese.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/selenese.py	2010-03-11 13:25:13 UTC (rev 109909)
+++ gocept.selenium/trunk/src/gocept/selenium/selenese.py	2010-03-11 14:32:25 UTC (rev 109910)
@@ -67,10 +67,10 @@
     def waitForPageToLoad(self):
         self.selenium.wait_for_page_to_load(self.timeout * 1000)
 
-    def waitForPopUp(self, windowID):
+    def waitForPopUp(self, windowID=''):
         self.selenium.wait_for_pop_up(windowID, self.timeout * 1000)
 
-    def selectPopUp(self, windowID, wait=True):
+    def selectPopUp(self, windowID='', wait=True):
         if wait:
             self.waitForPopUp(windowID)
         self.selenium.select_pop_up(windowID)

Modified: gocept.selenium/trunk/src/gocept/selenium/ztk/tests/test_selenese.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/ztk/tests/test_selenese.py	2010-03-11 13:25:13 UTC (rev 109909)
+++ gocept.selenium/trunk/src/gocept/selenium/ztk/tests/test_selenese.py	2010-03-11 14:32:25 UTC (rev 109910)
@@ -121,8 +121,11 @@
             self.selenium.deselectPopUp()
         super(PopUpTest, self).tearDown()
 
-    def test_wait_for_popup(self):
+    def test_wait_for_and_select_popup(self):
+        # smoke tests for calls not otherwise used in this test class
         self.selenium.waitForPopUp('gocept.selenium-popup')
+        self.selenium.waitForPopUp()
+        self.selenium.selectPopUp()
 
     def test_0_select_popup(self):
         # XXX needs to be run first as pop-up windows can apparently be