django driver now handles redirections

jlirochon · jlirochon · commit fe7c3e06e45d · 2014-11-11T19:19:28.000+01:00
diff --git a/splinter/driver/djangoclient.py b/splinter/driver/djangoclient.py
@@ -88,10 +88,17 @@ def _post_load(self):
             pass
         self.status_code = StatusCode(self._response.status_code, '')
 
+    def _handle_redirect_chain(self):
+        if self._response.redirect_chain:
+            for redirect_url, redirect_code in self._response.redirect_chain:
+                self._last_urls.append(redirect_url)
+            self._url = self._last_urls[-1]
+
     def visit(self, url):
         self._url = url
         self._response = self._browser.get(url, follow=True)
         self._last_urls.append(url)
+        self._handle_redirect_chain()
         self._post_load()
 
     def submit(self, form):
@@ -109,6 +116,7 @@ def submit(self, form):
             if getattr(input, 'type', '') == 'file' and key in data:
                 data[key] = open(data[key], 'rb')
         self._response = func_method(url, data, follow=True)
+        self._handle_redirect_chain()
         self._post_load()
         return self._response
 
diff --git a/tests/fake_django/urls.py b/tests/fake_django/urls.py
@@ -1,14 +1,24 @@
 import sys
 
 from django.conf.urls import patterns, include, url
+from django.core.urlresolvers import reverse
 from django.http import HttpResponse
 
+from django.shortcuts import redirect
 from django.contrib import admin
 from django.contrib.auth.decorators import login_required
 admin.autodiscover()
 
 sys.path.append('tests')
-from fake_webapp import EXAMPLE_HTML, EXAMPLE_IFRAME_HTML, EXAMPLE_ALERT_HTML, EXAMPLE_TYPE_HTML, EXAMPLE_NO_BODY_HTML, EXAMPLE_POPUP_HTML
+from fake_webapp import (
+    EXAMPLE_HTML,
+    EXAMPLE_IFRAME_HTML,
+    EXAMPLE_ALERT_HTML,
+    EXAMPLE_TYPE_HTML,
+    EXAMPLE_NO_BODY_HTML,
+    EXAMPLE_POPUP_HTML,
+    EXAMPLE_REDIRECT_LOCATION_HTML
+)
 
 
 def index(request):
@@ -69,6 +79,15 @@ def auth_required(request):
     return HttpResponse("Success!")
 
 
+def redirected(request):
+    location = '{}?{}'.format(reverse('redirect_location'), 'come=get&some=true')
+    return redirect(location)
+
+
+def redirect_location(request):
+    return HttpResponse(EXAMPLE_REDIRECT_LOCATION_HTML)
+
+
 urlpatterns = patterns(
     '',
     url(r'^$', index),
@@ -83,5 +102,7 @@ def auth_required(request):
     url(r'^query$', query_string),
     url(r'^popup$', popup),
     url(r'^authenticate$', auth_required),
+    url(r'^redirected', redirected),
+    url(r'^redirect-location', redirect_location, name='redirect_location'),
     url(r'^admin/', include(admin.site.urls)),
 )
diff --git a/tests/fake_webapp.py b/tests/fake_webapp.py
@@ -22,6 +22,7 @@ def read_static(static_name):
 EXAMPLE_TYPE_HTML = read_static('type.html')
 EXAMPLE_POPUP_HTML = read_static('popup.html')
 EXAMPLE_NO_BODY_HTML = read_static('no-body.html')
+EXAMPLE_REDIRECT_LOCATION_HTML = read_static('redirect-location.html')
 
 # Functions for http basic auth. 
 # Taken verbatim from http://flask.pocoo.org/snippets/8/
diff --git a/tests/static/redirect-location.html b/tests/static/redirect-location.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+
+<html>
+  <head>
+    <title>Redirect Location</title>
+  </head>
+  <body>
+    <h1>I just been redirected to this location.</h1>
+  </body>
+</html>
diff --git a/tests/test_djangoclient.py b/tests/test_djangoclient.py
@@ -7,6 +7,7 @@
 import os
 import sys
 import unittest
+import urlparse
 
 sys.path.append('tests/fake_django')
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
@@ -20,7 +21,9 @@ class DjangoClientDriverTest(BaseBrowserTests, unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.browser = Browser('django', wait_time=0.1)
+        components = urlparse.urlparse(EXAMPLE_APP)
+        cls.browser = Browser('django', wait_time=0.1, client_SERVER_NAME=components.hostname,
+                              client_SERVER_PORT=components.port)
 
     def setUp(self):
         self.browser.visit(EXAMPLE_APP)
@@ -124,3 +127,12 @@ def test_finding_all_links_by_non_ascii_text(self):
         for key, text in non_ascii_encodings.items():
             link = self.browser.find_link_by_text(text)
             self.assertEqual(key, link['id'])
+
+    def test_redirection(self):
+        """
+        when visiting /redirected, browser should be redirected to /redirected-location?come=get&some=true
+        browser.url should be updated
+        """
+        self.browser.visit('{}redirected'.format(EXAMPLE_APP))
+        assert 'I just been redirected to this location.' in self.browser.html
+        self.assertEqual('{}redirect-location?come=get&some=true'.format(EXAMPLE_APP), self.browser.url)
