[Checkins] SVN: zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real. make passing a URL to getLink work

[Benji York]

Log message for revision 79561:
  make passing a URL to getLink work
  

Changed:
  U   zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.js
  U   zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.py
  U   zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.txt

-=-
Modified: zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.js
===================================================================
--- zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.js	2007-09-11 09:38:10 UTC (rev 79560)
+++ zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.js	2007-09-11 09:47:07 UTC (rev 79561)
@@ -61,7 +61,7 @@
     var i=0;
     var found = null;
     if (index == undefined) index = null;
-    for (x=0; x < anchors.length; x++) {
+    for (var x=0; x < anchors.length; x++) {
         a = anchors[x];
         if (!predicate(a)) {
             continue;
@@ -96,17 +96,17 @@
         }, index)
 }
 
-function tb_get_link_by_id(id, index) {
+function tb_get_link_by_url(url, index) {
     return tb_get_link_by_predicate(
         function (a) {
-            return a.id == id;
+            return a.href.indexOf(url) == 0;
         }, index)
 }
 
-function tb_get_link_by_url(url, index) {
+function tb_get_link_by_id(id, index) {
     return tb_get_link_by_predicate(
         function (a) {
-            return a.href.indexOf(url) == 0;
+            return a.id == id;
         }, index)
 }
 

Modified: zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.py
===================================================================
--- zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.py	2007-09-11 09:38:10 UTC (rev 79560)
+++ zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.py	2007-09-11 09:47:07 UTC (rev 79561)
@@ -157,7 +157,7 @@
                  % (simplejson.dumps(text), js_index))
         elif url is not None:
             msg = 'url %r' % url
-            token = self.execute('tb_get_link_by_text(%s, %s)'
+            token = self.execute('tb_get_link_by_url(%s, %s)'
                  % (simplejson.dumps(url), js_index))
         elif id is not None:
             msg = 'id %r' % id

Modified: zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.txt
===================================================================
--- zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.txt	2007-09-11 09:38:10 UTC (rev 79560)
+++ zope.testbrowser/branches/benji-zope.testbrowser.real/src/zope/testbrowser/real.txt	2007-09-11 09:47:07 UTC (rev 79561)
@@ -28,4 +28,5 @@
     >>> browser.getLink('Preferences')
     <Link text='Preferences' url='http://images.google.com/preferences?hl=en'>
 
-#    >>> browser.getLink(url='http://news.google.com')
+    >>> browser.getLink(url='http://news.google.com/')
+    <Link text='News' url='http://news.google.com/nwshp?tab=in'>