Ticket #10747: 10747v2.diff

django/contrib/auth/tests/views.py

@@ -205 +205 @@
     def test_logout_default(self):
         "Logout without next_page option renders the default template"
         self.login()
-        response = self.client.get('/logout/')
+        response = self.client.get('/logout_test/')
         self.assertEquals(200, response.status_code)
         self.assert_('Logged out' in response.content)
         self.confirm_logged_out()
@@ -221 +221 @@
     def test_logout_with_redirect_argument(self):
         "Logout with query string redirects to specified resource"
         self.login()
-        response = self.client.get('/logout/?next=/login/')
+        response = self.client.get('/logout_test/?next=/login/')
         self.assertEqual(response.status_code, 302)
         self.assert_(response['Location'].endswith('/login/'))
         self.confirm_logged_out()
@@ -232 +232 @@
         response = self.client.get('/logout/custom_query/?follow=/somewhere/')
         self.assertEqual(response.status_code, 302)
         self.assert_(response['Location'].endswith('/somewhere/'))
-        self.confirm_logged_out()
- No newline at end of file
+        self.confirm_logged_out()

django/contrib/auth/tests/urls.py

@@ -1 @@
-from django.conf.urls.defaults import patterns
+from django.conf.urls.defaults import *
 from django.contrib.auth.urls import urlpatterns
 
 # special urls for auth test cases
 urlpatterns += patterns('',
     (r'^logout/custom_query/$', 'django.contrib.auth.views.logout', dict(redirect_field_name='follow')),
     (r'^logout/next_page/$', 'django.contrib.auth.views.logout', dict(next_page='/somewhere/')),
+    (r'^logout_test/$', 'django.contrib.auth.views.logout', dict(template_name='auth_test/logged_out.html')),
 )
 

django/contrib/auth/tests/templates/auth_test/logged_out.html

@@ +1 @@
+Logged out