Bugfix: an endpoint without a parent contaminated with its predecessor's parent.

Author: rczajka

Diff for: rest_framework_docs/api_docs.py

@@ -24,8 +24,8 @@ def __init__(self, drf_router=None):
     def get_all_view_names(self, urlpatterns, parent_pattern=None):
         for pattern in urlpatterns:
             if isinstance(pattern, RegexURLResolver):
-                parent_pattern = None if pattern._regex == "^" else pattern
-                self.get_all_view_names(urlpatterns=pattern.url_patterns, parent_pattern=parent_pattern)
+                new_parent_pattern = None if pattern._regex == "^" else pattern
+                self.get_all_view_names(urlpatterns=pattern.url_patterns, parent_pattern=new_parent_pattern)
             elif isinstance(pattern, RegexURLPattern) and self._is_drf_view(pattern) and not self._is_format_endpoint(pattern):
                 api_endpoint = ApiEndpoint(pattern, parent_pattern, self.drf_router)
                 self.endpoints.append(api_endpoint)

Diff for: tests/tests.py

@@ -49,6 +49,8 @@ def test_index_view_with_endpoints(self):
         # The view "OrganisationErroredView" (organisations/(?P<slug>[\w-]+)/errored/) should contain an error.
         self.assertEqual(str(response.context["endpoints"][9].errors), "'test_value'")
 
+        self.assertEqual(response.context["endpoints"][14].path, "/another-login/")
+
     def test_index_search_with_endpoints(self):
         response = self.client.get("%s?search=reset-password" % reverse("drfdocs"))
 
@@ -75,8 +77,8 @@ def test_model_viewset(self):
 
         self.assertEqual(response.context["endpoints"][10].path, '/organisations/<slug>/')
         self.assertEqual(response.context['endpoints'][6].fields[2]['to_many_relation'], True)
-        self.assertEqual(response.context["endpoints"][11].path, '/organisation-model-viewsets/')
-        self.assertEqual(response.context["endpoints"][12].path, '/organisation-model-viewsets/<pk>/')
+        self.assertEqual(response.context["endpoints"][11].path, '/router/organisation-model-viewsets/')
+        self.assertEqual(response.context["endpoints"][12].path, '/router/organisation-model-viewsets/<pk>/')
         self.assertEqual(response.context["endpoints"][11].allowed_methods, ['GET', 'POST', 'OPTIONS'])
         self.assertEqual(response.context["endpoints"][12].allowed_methods, ['GET', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'])
         self.assertEqual(response.context["endpoints"][13].allowed_methods, ['POST', 'OPTIONS'])

Diff for: tests/urls.py

@@ -36,7 +36,7 @@
     # API
     url(r'^accounts/', view=include(accounts_urls, namespace='accounts')),
     url(r'^organisations/', view=include(organisations_urls, namespace='organisations')),
-    url(r'^', include(router.urls)),
+    url(r'^router/', include(router.urls)),
 
     # Endpoints without parents/namespaces
     url(r'^another-login/$', views.LoginView.as_view(), name="login"),