From f5d044eb8cb66bce44d9796bfa1bbe60d5df7c81 Mon Sep 17 00:00:00 2001
From: Kenzo-Hugo Hillion <kenzo-hugo.hillion1@pasteur.fr>
Date: Mon, 5 Aug 2019 09:42:30 +0200
Subject: [PATCH] Fix test and add url namespaces
---
backend/metagenedb/api/accounts/tests.py | 4 ++--
backend/metagenedb/api/catalog/urls.py | 4 ++--
backend/metagenedb/api/catalog/views/test_gene.py | 4 ++--
backend/metagenedb/api/urls.py | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/backend/metagenedb/api/accounts/tests.py b/backend/metagenedb/api/accounts/tests.py
index 39171ec..dcc955e 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 4c03ee5..f334498 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 02b3202..e3c9e2e 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 e6a471f..9c589fe 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'))
]
--
GitLab