diff --git a/backend/metagenedb/api/accounts/tests.py b/backend/metagenedb/api/accounts/tests.py index 39171ec8fb7e0f19465f5cefacd9295515440df0..dcc955e3190e6860231cad8788ffb2162c68f340 100644 --- a/backend/metagenedb/api/accounts/tests.py +++ b/backend/metagenedb/api/accounts/tests.py @@ -12,7 +12,7 @@ class TestAccounts(APITestCase): def test_obtain_jwt(self): # create an inactive user - url = reverse('api-jwt-auth') + url = reverse('auth:api-jwt-auth') u = User.objects.create_user(username='user', email='user@foo.com', password='pass') u.is_active = False u.save() @@ -39,7 +39,7 @@ class TestAccounts(APITestCase): payload = jwt_payload_handler(user) token = jwt_encode_handler(payload) - verify_url = reverse('api-jwt-verify') + verify_url = reverse('auth:api-jwt-verify') credentials = { 'token': token } diff --git a/backend/metagenedb/api/catalog/urls.py b/backend/metagenedb/api/catalog/urls.py index 4c03ee5e5b99688e6d9c9cad80ec56521db59605..f334498aa5800a047ccbd750a6e02baec87a6fa7 100644 --- a/backend/metagenedb/api/catalog/urls.py +++ b/backend/metagenedb/api/catalog/urls.py @@ -7,10 +7,10 @@ from metagenedb.api.catalog.views import GeneViewSet, gene_length api_router = DefaultRouter() -api_router.register(r'genes', GeneViewSet, 'genes') +api_router.register(r'genes', GeneViewSet, base_name='genes') urlpatterns = [ re_path(r'^gene_length$', gene_length, name='gene_length'), - url(r'v1/', include(api_router.urls)) + url(r'v1/', include((api_router.urls, 'v1'), namespace='v1')) ] diff --git a/backend/metagenedb/api/catalog/views/test_gene.py b/backend/metagenedb/api/catalog/views/test_gene.py index 02b3202aabf636d65e9cb9a636baeecebf0d1c92..e3c9e2eb7f3dcf97d1d5b237902d7d667637b88e 100644 --- a/backend/metagenedb/api/catalog/views/test_gene.py +++ b/backend/metagenedb/api/catalog/views/test_gene.py @@ -14,7 +14,7 @@ class TestGenes(TestCase): Unauthenticated users should be able to access genes @TODO make unaccessible """ - url = reverse('genes') + url = reverse('catalog:v1:genes-list') resp = self.client.get(url) self.assertEqual(resp.status_code, status.HTTP_200_OK) @@ -32,6 +32,6 @@ class TestGenes(TestCase): payload = jwt_payload_handler(user) token = jwt_encode_handler(payload) - url = reverse('genes') + url = reverse('catalog:v1:genes-list') resp = self.client.get(url, format='json', HTTP_AUTHORIZATION=f"JWT {token}") self.assertEqual(resp.status_code, status.HTTP_200_OK) diff --git a/backend/metagenedb/api/urls.py b/backend/metagenedb/api/urls.py index e6a471f8f6eab03d84417664397d3f3095998cfc..9c589fe20f52d45938d5a309695f1ef7195330fd 100644 --- a/backend/metagenedb/api/urls.py +++ b/backend/metagenedb/api/urls.py @@ -2,6 +2,6 @@ from django.urls import include, path urlpatterns = [ - path('auth/', include('metagenedb.api.accounts.urls')), - path('catalog/', include('metagenedb.api.catalog.urls')) + path('auth/', include(('metagenedb.api.accounts.urls', 'auth'), namespace='auth')), + path('catalog/', include(('metagenedb.api.catalog.urls', 'catalog'), namespace='catalog')) ]