mirror of
https://github.com/django/django.git
synced 2025-09-26 12:09:19 +00:00
Refs #23813 -- Moved URLconfs into module and tidied docstrings.
This commit is contained in:
parent
392f64842f
commit
f2975c021d
10 changed files with 35 additions and 53 deletions
|
@ -4,12 +4,12 @@ from django.test.utils import override_settings
|
|||
|
||||
|
||||
class CheckUrlsTest(SimpleTestCase):
|
||||
@override_settings(ROOT_URLCONF='check_framework.urls_no_warnings')
|
||||
def test_include_no_warnings(self):
|
||||
@override_settings(ROOT_URLCONF='check_framework.urls.no_warnings')
|
||||
def test_no_warnings(self):
|
||||
result = check_url_config(None)
|
||||
self.assertEqual(result, [])
|
||||
|
||||
@override_settings(ROOT_URLCONF='check_framework.urls_include')
|
||||
@override_settings(ROOT_URLCONF='check_framework.urls.include_with_dollar')
|
||||
def test_include_with_dollar(self):
|
||||
result = check_url_config(None)
|
||||
self.assertEqual(len(result), 1)
|
||||
|
@ -18,8 +18,8 @@ class CheckUrlsTest(SimpleTestCase):
|
|||
expected_msg = "Your URL pattern '^include-with-dollar$' uses include with a regex ending with a '$'."
|
||||
self.assertIn(expected_msg, warning.msg)
|
||||
|
||||
@override_settings(ROOT_URLCONF='check_framework.urls_slash')
|
||||
def test_url_beginning_with_slash(self):
|
||||
@override_settings(ROOT_URLCONF='check_framework.urls.beginning_with_slash')
|
||||
def test_beginning_with_slash(self):
|
||||
result = check_url_config(None)
|
||||
self.assertEqual(len(result), 1)
|
||||
warning = result[0]
|
||||
|
@ -27,8 +27,8 @@ class CheckUrlsTest(SimpleTestCase):
|
|||
expected_msg = "Your URL pattern '/starting-with-slash/$' has a regex beginning with a '/'"
|
||||
self.assertIn(expected_msg, warning.msg)
|
||||
|
||||
@override_settings(ROOT_URLCONF='check_framework.urls_name')
|
||||
def test_url_pattern_name_with_colon(self):
|
||||
@override_settings(ROOT_URLCONF='check_framework.urls.name_with_colon')
|
||||
def test_name_with_colon(self):
|
||||
result = check_url_config(None)
|
||||
self.assertEqual(len(result), 1)
|
||||
warning = result[0]
|
||||
|
|
0
tests/check_framework/urls/__init__.py
Normal file
0
tests/check_framework/urls/__init__.py
Normal file
7
tests/check_framework/urls/beginning_with_slash.py
Normal file
7
tests/check_framework/urls/beginning_with_slash.py
Normal file
|
@ -0,0 +1,7 @@
|
|||
from django.conf.urls import include, url
|
||||
|
||||
urlpatterns = [
|
||||
url('^', include([
|
||||
url(r'/starting-with-slash/$', lambda x: x),
|
||||
])),
|
||||
]
|
7
tests/check_framework/urls/name_with_colon.py
Normal file
7
tests/check_framework/urls/name_with_colon.py
Normal file
|
@ -0,0 +1,7 @@
|
|||
from django.conf.urls import include, url
|
||||
|
||||
urlpatterns = [
|
||||
url('^', include([
|
||||
url(r'^$', lambda x: x, name='name_with:colon'),
|
||||
])),
|
||||
]
|
9
tests/check_framework/urls/no_warnings.py
Normal file
9
tests/check_framework/urls/no_warnings.py
Normal file
|
@ -0,0 +1,9 @@
|
|||
from django.conf.urls import include, url
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^foo/', lambda x: x, name='foo'),
|
||||
# This dollar is ok as it is escaped
|
||||
url(r'^\$', include([
|
||||
url(r'^bar/$', lambda x: x, name='bar'),
|
||||
])),
|
||||
]
|
|
@ -1,13 +0,0 @@
|
|||
from django.conf.urls import include, url
|
||||
from django.http import HttpResponse
|
||||
|
||||
|
||||
def view(request):
|
||||
return HttpResponse('')
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
url('^', include([
|
||||
url(r'^$', view, name='name_with:colon'),
|
||||
])),
|
||||
]
|
|
@ -1,15 +0,0 @@
|
|||
from django.conf.urls import include, url
|
||||
from django.http import HttpResponse
|
||||
|
||||
|
||||
def view(request):
|
||||
return HttpResponse('')
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^foo/', view, name='foo'),
|
||||
# This dollar is ok as it is escaped
|
||||
url(r'^\$', include([
|
||||
url(r'^bar/$', view, name='bar'),
|
||||
])),
|
||||
]
|
|
@ -1,13 +0,0 @@
|
|||
from django.conf.urls import include, url
|
||||
from django.http import HttpResponse
|
||||
|
||||
|
||||
def view(request):
|
||||
return HttpResponse('')
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
url('^', include([
|
||||
url(r'/starting-with-slash/$', view),
|
||||
])),
|
||||
]
|
Loading…
Add table
Add a link
Reference in a new issue