summaryrefslogtreecommitdiff
path: root/tests/regressiontests
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2009-10-15 14:12:34 +0000
committerLuke Plant <L.Plant.98@cantab.net>2009-10-15 14:12:34 +0000
commita2d8acbacda353248fd191b97155cd4cf27dcd66 (patch)
tree5941baafeb1c30840e837043418e9a362a83000e /tests/regressiontests
parentc161bf21f0ab9f2945ae7a44e5757b071f7eb712 (diff)
Fixed a regression on Python 2.6 caused by r11623
This might fix #12037, but I cannot reproduce that bug. Refs #12037 git-svn-id: http://code.djangoproject.com/svn/django/trunk@11625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
-rw-r--r--tests/regressiontests/context_processors/templates/context_processors/auth_attrs_user.html1
-rw-r--r--tests/regressiontests/context_processors/tests.py4
-rw-r--r--tests/regressiontests/context_processors/urls.py1
-rw-r--r--tests/regressiontests/context_processors/views.py3
4 files changed, 8 insertions, 1 deletions
diff --git a/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_user.html b/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_user.html
index 7ff2c938a2..7ed16d7867 100644
--- a/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_user.html
+++ b/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_user.html
@@ -1,3 +1,4 @@
unicode: {{ user }}
id: {{ user.id }}
username: {{ user.username }}
+url: {% url userpage user %}
diff --git a/tests/regressiontests/context_processors/tests.py b/tests/regressiontests/context_processors/tests.py
index a05b143e55..c7fc4e5a93 100644
--- a/tests/regressiontests/context_processors/tests.py
+++ b/tests/regressiontests/context_processors/tests.py
@@ -4,7 +4,7 @@ Tests for Django's bundled context processors.
from django.conf import settings
from django.test import TestCase
-
+from django.template import Template
class RequestContextProcessorTests(TestCase):
"""
@@ -79,3 +79,5 @@ class AuthContextProcessorTests(TestCase):
self.assertContains(response, "unicode: super")
self.assertContains(response, "id: 100")
self.assertContains(response, "username: super")
+ # bug #12037 is tested by the {% url %} in the template:
+ self.assertContains(response, "url: /userpage/super/")
diff --git a/tests/regressiontests/context_processors/urls.py b/tests/regressiontests/context_processors/urls.py
index 45c5fe7777..30728c8df8 100644
--- a/tests/regressiontests/context_processors/urls.py
+++ b/tests/regressiontests/context_processors/urls.py
@@ -10,4 +10,5 @@ urlpatterns = patterns('',
(r'^auth_processor_user/$', views.auth_processor_user),
(r'^auth_processor_perms/$', views.auth_processor_perms),
(r'^auth_processor_messages/$', views.auth_processor_messages),
+ url(r'^userpage/(.+)/$', views.userpage, name="userpage"),
)
diff --git a/tests/regressiontests/context_processors/views.py b/tests/regressiontests/context_processors/views.py
index e5195f9c65..3f2dcb037b 100644
--- a/tests/regressiontests/context_processors/views.py
+++ b/tests/regressiontests/context_processors/views.py
@@ -32,3 +32,6 @@ def auth_processor_messages(request):
request.user.message_set.create(message="Message 1")
return render_to_response('context_processors/auth_attrs_messages.html',
RequestContext(request, {}, processors=[context_processors.auth]))
+
+def userpage(request):
+ pass