Merge pull request #1816 from carltongibson/regression-login-template

Regression for #1810: Test login view renders

3 files changed, 13 insertions, 2 deletions

diff --git a/rest_framework/urls.py b/rest_framework/urls.py
index 8fa3073e..cfcee534 100644
--- a/rest_framework/urls.py
+++ b/rest_framework/urls.py
@@ -6,7 +6,7 @@ your API requires authentication:
 
     urlpatterns = patterns('',
         ...
-        url(r'^auth', include('rest_framework.urls', namespace='rest_framework'))
+        url(r'^auth/', include('rest_framework.urls', namespace='rest_framework'))
     )
 
 The urls must be namespaced as 'rest_framework', and you should make sure
diff --git a/tests/conftest.py b/tests/conftest.py
index f3723aea..4b33e19c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -5,6 +5,7 @@ def pytest_configure():
         DEBUG_PROPAGATE_EXCEPTIONS=True,
         DATABASES={'default': {'ENGINE': 'django.db.backends.sqlite3',
                                'NAME': ':memory:'}},
+        SITE_ID=1,
         SECRET_KEY='not very secret in tests',
         USE_I18N=True,
         USE_L10N=True,
diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index 2b9d73e4..32041f9c 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -57,7 +57,8 @@ urlpatterns = patterns(
             authentication_classes=[OAuthAuthentication],
             permission_classes=[permissions.TokenHasReadWriteScope]
         )
-    )
+    ),
+    url(r'^auth/', include('rest_framework.urls', namespace='rest_framework'))
 )
 
 
@@ -134,6 +135,15 @@ class SessionAuthTests(TestCase):
     def tearDown(self):
         self.csrf_client.logout()
 
+    def test_login_view_renders_on_get(self):
+        """
+        Ensure the login template renders for a basic GET.
+
+        cf. [#1810](https://github.com/tomchristie/django-rest-framework/pull/1810)
+        """
+        response = self.csrf_client.get('/auth/login/')
+        self.assertContains(response, '<Label class="span4">Username:</label>')
+
     def test_post_form_session_auth_failing_csrf(self):
         """
         Ensure POSTing form over session authentication without CSRF token fails.