mirror of
https://github.com/django/django.git
synced 2025-10-06 08:40:42 +00:00
[4.1.x] Fixed #33955, Fixed #33971 -- Reverted "Fixed #32565 -- Moved internal URLResolver view-strings mapping to admindocs."
This reverts commit7f3cfaa12b
. Thanks Tom Carrick and Greg Kaleka for reports. Backport of974942a750
from main
This commit is contained in:
parent
02876534ab
commit
a1083805ac
7 changed files with 54 additions and 82 deletions
|
@ -1,15 +1,13 @@
|
|||
import unittest
|
||||
|
||||
from django.contrib.admindocs.utils import (
|
||||
_is_callback,
|
||||
docutils_is_available,
|
||||
parse_docstring,
|
||||
parse_rst,
|
||||
)
|
||||
from django.test.utils import captured_stderr
|
||||
from django.urls import get_resolver
|
||||
|
||||
from .tests import AdminDocsSimpleTestCase, SimpleTestCase
|
||||
from .tests import AdminDocsSimpleTestCase
|
||||
|
||||
|
||||
@unittest.skipUnless(docutils_is_available, "no docutils installed.")
|
||||
|
@ -121,28 +119,3 @@ class TestUtils(AdminDocsSimpleTestCase):
|
|||
markup = "<p>reST, <cite>interpreted text</cite>, default role.</p>\n"
|
||||
parts = docutils.core.publish_parts(source=source, writer_name="html4css1")
|
||||
self.assertEqual(parts["fragment"], markup)
|
||||
|
||||
|
||||
class TestResolver(SimpleTestCase):
|
||||
def test_namespaced_view_detail(self):
|
||||
resolver = get_resolver("urlpatterns_reverse.nested_urls")
|
||||
self.assertTrue(_is_callback("urlpatterns_reverse.nested_urls.view1", resolver))
|
||||
self.assertTrue(_is_callback("urlpatterns_reverse.nested_urls.view2", resolver))
|
||||
self.assertTrue(_is_callback("urlpatterns_reverse.nested_urls.View3", resolver))
|
||||
self.assertFalse(_is_callback("urlpatterns_reverse.nested_urls.blub", resolver))
|
||||
|
||||
def test_view_detail_as_method(self):
|
||||
# Views which have a class name as part of their path.
|
||||
resolver = get_resolver("urlpatterns_reverse.method_view_urls")
|
||||
self.assertTrue(
|
||||
_is_callback(
|
||||
"urlpatterns_reverse.method_view_urls.ViewContainer.method_view",
|
||||
resolver,
|
||||
)
|
||||
)
|
||||
self.assertTrue(
|
||||
_is_callback(
|
||||
"urlpatterns_reverse.method_view_urls.ViewContainer.classmethod_view",
|
||||
resolver,
|
||||
)
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue