Add tests for opening relative urls

zopefoundation · Mar 22, 2013 · 3057901 · 3057901
1 parent ee6d362
commit 3057901
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/src/zope/testbrowser/browser.py b/src/zope/testbrowser/browser.py
@@ -158,7 +158,7 @@ def url(self):
     @property
     def isHtml(self):
         """See zope.testbrowser.interfaces.IBrowser"""
-        return 'html' in self._response.content_type
+        return self._response and 'html' in self._response.content_type
 
     @property
     def lastRequestPystones(self):
@@ -236,7 +236,7 @@ def addHeader(self, key, value):
 
     def open(self, url, data=None):
         """See zope.testbrowser.interfaces.IBrowser"""
-        url = str(url)
+        url = self._absoluteUrl(url)
         if data is not None:
             make_request = lambda args:  self.testapp.post(url, data, **args)
         else:
@@ -480,6 +480,13 @@ def _preparedRequest(self, url):
         self.timer.stop()
 
     def _absoluteUrl(self, url):
+        absolute = url.startswith('http://') or url.startswith('https://')
+        if absolute:
+            return url
+
+        if not self.isHtml:
+            raise BrowserStateError("can't fetch relative reference: not viewing any document")
+
         return str(urlparse.urljoin(self._getBaseUrl(), url))
 
     def toStr(self, s):

diff --git a/src/zope/testbrowser/tests/test_browser.py b/src/zope/testbrowser/tests/test_browser.py
@@ -348,6 +348,36 @@ def test_relative_link():
     'http://localhost/base?key=value'
     """
 
+def test_relative_open():
+    """
+    Browser is capable of opening relative urls as well as relative links
+
+    >>> app = TestApp()
+    >>> browser = Browser(wsgi_app=app)
+
+    >>> app.set_next_response(b'''\
+    ... <html><body>
+    ...     <a href="foo">link</a>
+    ... </body></html>
+    ... ''')
+    >>> browser.open('bar') # doctest: +ELLIPSIS
+    Traceback (most recent call last):
+    ...
+    BrowserStateError: can't fetch relative reference: not viewing any document
+
+    >>> browser.open('http://localhost/hello/foo') # doctest: +ELLIPSIS
+    GET /hello/foo HTTP/1.1
+    ...
+
+    >>> browser.open('bar') # doctest: +ELLIPSIS
+    GET /hello/bar HTTP/1.1
+    ...
+
+    >>> browser.open('/bar') # doctest: +ELLIPSIS
+    GET /bar HTTP/1.1
+    ...
+
+    """
 
 def test_suite():
     return doctest.DocTestSuite(