From 6390155f5c619d708b3dab877388c65ca65d5bcb Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com> Date: Sun, 31 Aug 2008 17:29:49 +0000 Subject: [PATCH] Added a couple of extra tests to ensure url tag robustness. These are an attempt to verify #8726. Refs #8726. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8766 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/templates/tests.py | 2 ++ tests/regressiontests/templates/urls.py | 1 + tests/regressiontests/templates/views.py | 3 +++ 3 files changed, 6 insertions(+) diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index e779cea607..c6e915bb56 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -891,6 +891,8 @@ class Templates(unittest.TestCase): 'url03': ('{% url regressiontests.templates.views.index %}', {}, '/url_tag/'), 'url04': ('{% url named.client client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'), 'url05': (u'{% url метка_оператора v %}', {'v': u'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'), + 'url06': (u'{% url метка_оператора_2 tag=v %}', {'v': u'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'), + 'url07': (u'{% url regressiontests.templates.views.client2 tag=v %}', {'v': u'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'), # Failures 'url-fail01': ('{% url %}', {}, template.TemplateSyntaxError), diff --git a/tests/regressiontests/templates/urls.py b/tests/regressiontests/templates/urls.py index 3b28e70d0b..e02e0defe1 100644 --- a/tests/regressiontests/templates/urls.py +++ b/tests/regressiontests/templates/urls.py @@ -12,4 +12,5 @@ urlpatterns = patterns('', # Unicode strings are permitted everywhere. url(ur'^Юникод/(\w+)/$', views.client, name=u"метка_оператора"), + url(ur'^Юникод/(?P<tag>\S+)/$', 'regressiontests.templates.views.client2', name=u"метка_оператора_2"), ) diff --git a/tests/regressiontests/templates/views.py b/tests/regressiontests/templates/views.py index b68809944a..ca3cecde8f 100644 --- a/tests/regressiontests/templates/views.py +++ b/tests/regressiontests/templates/views.py @@ -8,3 +8,6 @@ def client(request, id): def client_action(request, id, action): pass + +def client2(request, tag): + pass