mirror of
https://github.com/django/django.git
synced 2025-08-03 18:38:50 +00:00
Fixed #24127 -- Changed the default current_app to the current namespace.
Changed the url template tag to use request.resolver_match.namespace as a default for the current_app argument if request.current_app is not set.
This commit is contained in:
parent
6024fd5dc2
commit
bc7923beff
6 changed files with 74 additions and 21 deletions
|
@ -1,7 +1,9 @@
|
|||
# coding: utf-8
|
||||
from django.core.urlresolvers import NoReverseMatch
|
||||
from django.template import TemplateSyntaxError
|
||||
from django.test import SimpleTestCase, ignore_warnings, override_settings
|
||||
from django.core.urlresolvers import NoReverseMatch, resolve
|
||||
from django.template import RequestContext, TemplateSyntaxError
|
||||
from django.test import (
|
||||
RequestFactory, SimpleTestCase, ignore_warnings, override_settings,
|
||||
)
|
||||
from django.utils.deprecation import RemovedInDjango110Warning
|
||||
|
||||
from ..utils import setup
|
||||
|
@ -252,3 +254,29 @@ class UrlTagTests(SimpleTestCase):
|
|||
def test_url_asvar03(self):
|
||||
output = self.engine.render_to_string('url-asvar03')
|
||||
self.assertEqual(output, '')
|
||||
|
||||
@setup({'url-namespace01': '{% url "app:named.client" 42 %}'})
|
||||
def test_url_namespace01(self):
|
||||
request = RequestFactory().get('/')
|
||||
request.resolver_match = resolve('/ns1/')
|
||||
template = self.engine.get_template('url-namespace01')
|
||||
context = RequestContext(request)
|
||||
output = template.render(context)
|
||||
self.assertEqual(output, '/ns1/named-client/42/')
|
||||
|
||||
@setup({'url-namespace02': '{% url "app:named.client" 42 %}'})
|
||||
def test_url_namespace02(self):
|
||||
request = RequestFactory().get('/')
|
||||
request.resolver_match = resolve('/ns2/')
|
||||
template = self.engine.get_template('url-namespace02')
|
||||
context = RequestContext(request)
|
||||
output = template.render(context)
|
||||
self.assertEqual(output, '/ns2/named-client/42/')
|
||||
|
||||
@setup({'url-namespace03': '{% url "app:named.client" 42 %}'})
|
||||
def test_url_namespace03(self):
|
||||
request = RequestFactory().get('/')
|
||||
template = self.engine.get_template('url-namespace03')
|
||||
context = RequestContext(request)
|
||||
output = template.render(context)
|
||||
self.assertEqual(output, '/ns2/named-client/42/')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue