Merge pull request #85 from cjwatson/follow-redirects-option

Add Browser.followRedirects option

CHANGES.rst

@@ -9,6 +9,10 @@ CHANGES
   subsequent queries could use data from the wrong response.  See `issue 83
   <https://github.com/zopefoundation/zope.testbrowser/issues/83>`_.
 
+- Support telling the browser not to follow redirects by setting
+  ``Browser.follow_redirects`` to False.  See `issue 79
+  <https://github.com/zopefoundation/zope.testbrowser/issues/79>`_.
+
 
 5.4.0 (2019-11-01)
 ------------------

src/zope/testbrowser/browser.py

@@ -143,6 +143,7 @@ def __init__(self, url=None, wsgi_app=None):
         self.timer = Timer()
         self.raiseHttpErrors = True
         self.handleErrors = True
+        self.followRedirects = True
 
         if wsgi_app is None:
             self.testapp = TestbrowserApp(TransparentProxy())
@@ -273,13 +274,15 @@ def _processRequest(self, url, make_request):
         with self._preparedRequest(url) as reqargs:
             self._history.add(self._response)
             resp = make_request(reqargs)
-            remaining_redirects = 100  # infinite loops protection
-            while resp.status_int in REDIRECTS and remaining_redirects:
-                remaining_redirects -= 1
-                url = urlparse.urljoin(url, resp.headers['location'])
-                with self._preparedRequest(url) as reqargs:
-                    resp = self.testapp.get(url, **reqargs)
-            assert remaining_redirects > 0, "redirects chain looks infinite"
+            if self.followRedirects:
+                remaining_redirects = 100  # infinite loops protection
+                while resp.status_int in REDIRECTS and remaining_redirects:
+                    remaining_redirects -= 1
+                    url = urlparse.urljoin(url, resp.headers['location'])
+                    with self._preparedRequest(url) as reqargs:
+                        resp = self.testapp.get(url, **reqargs)
+                assert remaining_redirects > 0, (
+                    "redirects chain looks infinite")
             self._setResponse(resp)
             self._checkStatus()
 

src/zope/testbrowser/tests/test_browser.py

@@ -208,6 +208,25 @@ def test_relative_redirect(self):
     """
 
 
+def test_disable_following_redirects(self):
+    """
+    If followRedirects is False, the browser does not follow redirects.
+
+    >>> app = YetAnotherTestApp()
+    >>> browser = Browser(wsgi_app=app)
+    >>> redirect = ('Location', 'http://localhost/the_thing')
+    >>> app.add_response(b"Moved", headers=[redirect],
+    ...                  status=302, reason='Found')
+
+    >>> browser.followRedirects = False
+    >>> browser.open('http://localhost/')
+    >>> browser.headers['Status']
+    '302 Found'
+    >>> browser.headers['Location']
+    'http://localhost/the_thing'
+    """
+
+
 def test_relative_open_allowed_after_non_html_page(self):
     """
     >>> app = YetAnotherTestApp()