make passing a URL to getLink work

zopefoundation · Sep 11, 2007 · 11c64ef · 11c64ef
1 parent 0e26a55
commit 11c64ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/zope/testbrowser/real.js b/src/zope/testbrowser/real.js
@@ -61,7 +61,7 @@ function tb_get_link_by_predicate(predicate, index) {
     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 @@ function tb_get_link_by_text(text, index) {
         }, 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)
 }
 

diff --git a/src/zope/testbrowser/real.py b/src/zope/testbrowser/real.py
@@ -157,7 +157,7 @@ def getLink(self, text=None, url=None, id=None, index=None):
                  % (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

diff --git a/src/zope/testbrowser/real.txt b/src/zope/testbrowser/real.txt
@@ -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'>