[Checkins] SVN: zc.testbrowser/trunk/src/zc/testbrowser/ Until now, you had to manually call wait() every time you clicked a link

Stephan Richter srichter at cosmos.phy.tufts.edu
Mon Apr 28 20:30:51 EDT 2008


Log message for revision 85838:
  Until now, you had to manually call wait() every time you clicked a link 
  or on a submitting control. How lame! :-) I switched the code to call 
  wait for us and all the tests pass, so I think I did it correctly.
  

Changed:
  U   zc.testbrowser/trunk/src/zc/testbrowser/README.txt
  U   zc.testbrowser/trunk/src/zc/testbrowser/real.py

-=-
Modified: zc.testbrowser/trunk/src/zc/testbrowser/README.txt
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/README.txt	2008-04-28 21:22:09 UTC (rev 85837)
+++ zc.testbrowser/trunk/src/zc/testbrowser/README.txt	2008-04-29 00:30:20 UTC (rev 85838)
@@ -130,7 +130,6 @@
 Links can be "clicked" and the browser will navigate to the referenced URL.
 
     >>> link.click()
-    >>> browser.wait()
     >>> browser.url
     'http://localhost:.../target.html'
     >>> browser.contents
@@ -148,7 +147,6 @@
     >>> link.text
     'Link Text with Whitespace Normalization (and parens)'
     >>> link.click()
-    >>> browser.wait()
     >>> browser.url
     'http://localhost:.../target.html'
 
@@ -175,7 +173,6 @@
 
     >>> browser.open('navigate.html')
     >>> browser.getLink(url='target.html').click()
-    >>> browser.wait()
     >>> browser.url
     'http://localhost:.../target.html'
 
@@ -186,7 +183,6 @@
     '...<a href="target.html" id="anchorid">By Anchor Id</a>...'
 
     >>> browser.getLink(id='anchorid').click()
-    >>> browser.wait()
     >>> browser.url
     'http://localhost:.../target.html'
 
@@ -197,7 +193,6 @@
     >>> browser.open('navigate.html')
     >>> link = browser.getLink(id='zope3')
     >>> link.click()
-    >>> browser.wait()
     >>> browser.url
     'http://localhost:.../target.html'
 
@@ -899,7 +894,6 @@
 
     >>> browser.getControl('Text Control').value = 'Other Text'
     >>> browser.getControl('Submit').click()
-    >>> browser.wait()
     >>> browser.contents
     "...'text-value': ['Other Text']..."
 
@@ -919,7 +913,6 @@
     >>> browser.open('controls.html')
     >>> browser.getControl('Text Control').value = 'Other Text'
     >>> browser.getControl(name='image-value').click()
-    >>> browser.wait()
     >>> browser.contents
     "...'text-value': ['Other Text']..."
 
@@ -1024,7 +1017,6 @@
     >>> browser.open('forms.html')
     >>> form = browser.getForm('2')
     >>> form.getControl('Submit').click()
-    >>> browser.wait()
     >>> browser.contents
     "...'text-value': ['Second Text']..."
     >>> browser.open('forms.html')
@@ -1104,7 +1096,6 @@
 
     >>> browser.open('navigate.html')
     >>> browser.getLink('Spaces in the URL').click()
-    >>> browser.wait()
 
 .goBack() Truncation
 ~~~~~~~~~~~~~~~~~~~~
@@ -1128,9 +1119,9 @@
 Poster and Stephan Richter making large contributions.
 
 The zc.testbrowser.real version was conceptualized by Benji York in 2007 and
-after an initial implementation sketch, brought to fruition by Stephan Richter,
-Rocky Burt, Justas Sadzevicius, and others at the Foliage Zope 3 sprint in Boston, MA
-during the week of September 24, 2007.
+after an initial implementation sketch, brought to fruition by Stephan
+Richter, Rocky Burt, Justas Sadzevicius, and others at the Foliage Zope 3
+sprint in Boston, MA during the week of September 24, 2007.
 
 There have been many other contributions from users of testbrowser that are
 greatly appreciated.

Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.py	2008-04-28 21:22:09 UTC (rev 85837)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.py	2008-04-29 00:30:20 UTC (rev 85838)
@@ -313,6 +313,7 @@
         if self._browser_counter != self.browser._counter:
             raise zc.testbrowser.interfaces.ExpiredError
         self.browser.js.tb_click_token(self.token)
+        self.browser.wait()
         self.browser._changed()
 
     @property
@@ -511,6 +512,7 @@
         if self._browser_counter != self.browser._counter:
             raise zc.testbrowser.interfaces.ExpiredError
         self.browser.js.tb_click_token(self.token)
+        self.browser.wait()
         self.browser._changed()
 
 
@@ -521,6 +523,7 @@
         if self._browser_counter != self.browser._counter:
             raise zc.testbrowser.interfaces.ExpiredError
         self.browser.js.tb_click_token(self.token, *coord)
+        self.browser.wait()
         self.browser._changed()
 
     @property
@@ -657,6 +660,7 @@
             button = self.browser.getControlToken(
                 label, name, index, self.token)
             self.browser.js.tb_click_token(button, *coord)
+        self.browser.wait()
         self.browser._changed()
 
     def getControl(self, label=None, name=None, index=None):



More information about the Checkins mailing list