From 974942a75039ba43e618f6a5ff95e08b5d5176fd Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 1 Sep 2022 21:09:16 +0200 Subject: Fixed #33955, Fixed #33971 -- Reverted "Fixed #32565 -- Moved internal URLResolver view-strings mapping to admindocs." This reverts commit 7f3cfaa12b28d15c0ca78bb692bfd6e59d17bff1. Thanks Tom Carrick and Greg Kaleka for reports. --- tests/admin_docs/test_utils.py | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'tests/admin_docs') diff --git a/tests/admin_docs/test_utils.py b/tests/admin_docs/test_utils.py index e26a4ca1f3..18c6769fad 100644 --- a/tests/admin_docs/test_utils.py +++ b/tests/admin_docs/test_utils.py @@ -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 = "

reST, interpreted text, default role.

\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, - ) - ) -- cgit v1.3