From 148823018e3f61b2c887f3dc9ede07c1cf3e7173 Mon Sep 17 00:00:00 2001 From: mattiagiupponi Date: Tue, 13 Jul 2021 13:00:18 +0200 Subject: [PATCH] [Fixes #7740] Reverse url fix for tests --- geonode/base/api/tests.py | 51 ++-------------------------- geonode/documents/api/tests.py | 56 ++----------------------------- geonode/geoapps/api/tests.py | 61 ++-------------------------------- geonode/layers/api/tests.py | 53 ++--------------------------- geonode/maps/api/tests.py | 49 +-------------------------- 5 files changed, 9 insertions(+), 261 deletions(-) diff --git a/geonode/base/api/tests.py b/geonode/base/api/tests.py index 18fd665a847..6c0224ae31c 100644 --- a/geonode/base/api/tests.py +++ b/geonode/base/api/tests.py @@ -24,18 +24,14 @@ from unittest.mock import patch from urllib.parse import urljoin -import django from django.urls import reverse from django.core.files import File -from django.conf.urls import url, include -from django.views.generic import TemplateView +from django.conf.urls import url from django.contrib.auth import get_user_model -from django.views.i18n import JavaScriptCatalog from rest_framework.test import APITestCase, URLPatternsTestCase from guardian.shortcuts import get_anonymous_user -from geonode.api.urls import router from geonode.base.models import ( CuratedThumbnail, HierarchicalKeyword, @@ -48,11 +44,7 @@ from geonode import geoserver from geonode.favorite.models import Favorite from geonode.utils import check_ogc_backend -from geonode.services.views import services -from geonode.maps.views import map_embed from geonode.layers.models import Layer -from geonode.layers.views import layer_embed, layer_detail -from geonode.geoapps.views import geoapp_edit from geonode.base.utils import build_absolute_uri from geonode.base.populate_test_data import create_models from geonode.security.utils import get_resources_with_perms @@ -71,46 +63,7 @@ class BaseApiTests(APITestCase, URLPatternsTestCase): "test_thesaurus.json" ] - urlpatterns = [ - url(r'^home/$', - TemplateView.as_view(template_name='index.html'), - name='home'), - url(r'^help/$', - TemplateView.as_view(template_name='help.html'), - name='help'), - url(r"^account/", include("allauth.urls")), - url(r'^people/', include('geonode.people.urls')), - url(r'^api/v2/', include(router.urls)), - url(r'^api/v2/', include('geonode.api.urls')), - url(r'^api/v2/api-auth/', include('rest_framework.urls', namespace='geonode_rest_framework')), - url(r'^$', - TemplateView.as_view(template_name='layers/layer_list.html'), - {'facet_type': 'layers', 'is_layer': True}, - name='layer_browse'), - url(r'^$', - TemplateView.as_view(template_name='maps/map_list.html'), - {'facet_type': 'maps', 'is_map': True}, - name='maps_browse'), - url(r'^$', - TemplateView.as_view(template_name='documents/document_list.html'), - {'facet_type': 'documents', 'is_document': True}, - name='document_browse'), - url(r'^$', - TemplateView.as_view(template_name='groups/group_list.html'), - name='group_list'), - url(r'^search/$', - TemplateView.as_view(template_name='search/search.html'), - name='search'), - url(r'^$', services, name='services'), - url(r'^invitations/', include( - 'geonode.invitations.urls', namespace='geonode.invitations')), - url(r'^i18n/', include(django.conf.urls.i18n), name="i18n"), - url(r'^jsi18n/$', JavaScriptCatalog.as_view(), {}, name='javascript-catalog'), - url(r'^(?P[^/]+)/embed$', map_embed, name='map_embed'), - url(r'^(?P[^/]+)/embed$', layer_embed, name='layer_embed'), - url(r'^(?P[^/]+)/embed$', geoapp_edit, {'template': 'apps/app_embed.html'}, name='geoapp_embed'), - url(r'^(?P[^/]*)$', layer_detail, name="layer_detail"), - ] + from geonode.urls import urlpatterns if check_ogc_backend(geoserver.BACKEND_PACKAGE): from geonode.geoserver.views import layer_acls, resolve_user diff --git a/geonode/documents/api/tests.py b/geonode/documents/api/tests.py index 978fac1102c..b37da8878a8 100644 --- a/geonode/documents/api/tests.py +++ b/geonode/documents/api/tests.py @@ -17,24 +17,15 @@ # along with this program. If not, see . # ######################################################################### -import django import logging from urllib.parse import urljoin from django.urls import reverse -from django.conf.urls import url, include -from django.views.generic import TemplateView -from django.views.i18n import JavaScriptCatalog +from django.conf.urls import url from rest_framework.test import APITestCase, URLPatternsTestCase -from geonode.api.urls import router -from geonode.services.views import services from geonode.documents.models import Document -from geonode.maps.views import map_embed -from geonode.geoapps.views import geoapp_edit -from geonode.layers.views import layer_upload, layer_embed -from geonode.documents.views import document_download, document_link from geonode import geoserver from geonode.utils import check_ogc_backend @@ -51,50 +42,7 @@ class DocumentsApiTests(APITestCase, URLPatternsTestCase): 'default_oauth_apps.json' ] - urlpatterns = [ - url(r'^home/$', - TemplateView.as_view(template_name='index.html'), - name='home'), - url(r'^help/$', - TemplateView.as_view(template_name='help.html'), - name='help'), - url(r"^account/", include("allauth.urls")), - url(r'^people/', include('geonode.people.urls')), - url(r'^api/v2/', include(router.urls)), - url(r'^api/v2/', include('geonode.api.urls')), - url(r'^api/v2/api-auth/', include('rest_framework.urls', namespace='geonode_rest_framework')), - url(r'^(?P\d+)/download/?$', document_download, name='document_download'), - url(r'^upload$', layer_upload, name='layer_upload'), - url(r'^$', - TemplateView.as_view(template_name='layers/layer_list.html'), - {'facet_type': 'layers', 'is_layer': True}, - name='layer_browse'), - url(r'^$', - TemplateView.as_view(template_name='maps/map_list.html'), - {'facet_type': 'maps', 'is_map': True}, - name='maps_browse'), - url(r'^$', - TemplateView.as_view(template_name='documents/document_list.html'), - {'facet_type': 'documents', 'is_document': True}, - name='document_browse'), - url(r'^$', - TemplateView.as_view(template_name='groups/group_list.html'), - name='group_list'), - url(r'^search/$', - TemplateView.as_view(template_name='search/search.html'), - name='search'), - url(r'^$', services, name='services'), - url(r'^invitations/', include( - 'geonode.invitations.urls', namespace='geonode.invitations')), - url(r'^i18n/', include(django.conf.urls.i18n), name="i18n"), - url(r'^jsi18n/$', JavaScriptCatalog.as_view(), {}, name='javascript-catalog'), - url(r'^(?P[^/]+)/embed$', map_embed, name='map_embed'), - url(r'^(?P[^/]+)/embed$', layer_embed, name='layer_embed'), - url(r'^(?P[^/]+)/embed$', geoapp_edit, {'template': 'apps/app_embed.html'}, name='geoapp_embed'), - url(r'^developer/$', TemplateView.as_view(template_name='developer.html'), name='developer'), - url(r'^about/$', TemplateView.as_view(template_name='about.html'), name='about'), - url(r'^(?P\d+)/link/?$', document_link, name='document_link'), - ] + from geonode.urls import urlpatterns if check_ogc_backend(geoserver.BACKEND_PACKAGE): from geonode.geoserver.views import layer_acls, resolve_user diff --git a/geonode/geoapps/api/tests.py b/geonode/geoapps/api/tests.py index 6480c0a8e12..92d55d5ac67 100644 --- a/geonode/geoapps/api/tests.py +++ b/geonode/geoapps/api/tests.py @@ -18,21 +18,13 @@ # ######################################################################### import json -import django import logging from django.urls import reverse -from django.conf.urls import url, include -from django.views.generic import TemplateView +from django.conf.urls import url from django.contrib.auth import get_user_model -from django.views.i18n import JavaScriptCatalog from rest_framework.test import APITestCase, URLPatternsTestCase -from geonode.api.urls import router -from geonode.services.views import services -from geonode.maps.views import map_embed -from geonode.geoapps.views import geoapp_edit -from geonode.layers.views import layer_upload, layer_embed from geonode.geoapps.models import GeoApp, GeoAppData from geonode import geoserver @@ -50,56 +42,7 @@ class BaseApiTests(APITestCase, URLPatternsTestCase): 'default_oauth_apps.json' ] - urlpatterns = [ - url(r'^home/$', - TemplateView.as_view(template_name='index.html'), - name='home'), - url(r'^help/$', - TemplateView.as_view(template_name='help.html'), - name='help'), - url(r'^developer/$', - TemplateView.as_view( - template_name='developer.html'), - name='developer'), - url(r'^about/$', - TemplateView.as_view(template_name='about.html'), - name='about'), - url(r'^privacy_cookies/$', - TemplateView.as_view(template_name='privacy-cookies.html'), - name='privacy-cookies'), - url(r"^account/", include("allauth.urls")), - url(r'^people/', include('geonode.people.urls')), - url(r'^api/v2/', include(router.urls)), - url(r'^api/v2/', include('geonode.api.urls')), - url(r'^api/v2/api-auth/', include('rest_framework.urls', namespace='geonode_rest_framework')), - url(r'^upload$', layer_upload, name='layer_upload'), - url(r'^$', - TemplateView.as_view(template_name='layers/layer_list.html'), - {'facet_type': 'layers', 'is_layer': True}, - name='layer_browse'), - url(r'^$', - TemplateView.as_view(template_name='maps/map_list.html'), - {'facet_type': 'maps', 'is_map': True}, - name='maps_browse'), - url(r'^$', - TemplateView.as_view(template_name='documents/document_list.html'), - {'facet_type': 'documents', 'is_document': True}, - name='document_browse'), - url(r'^$', - TemplateView.as_view(template_name='groups/group_list.html'), - name='group_list'), - url(r'^search/$', - TemplateView.as_view(template_name='search/search.html'), - name='search'), - url(r'^$', services, name='services'), - url(r'^invitations/', include( - 'geonode.invitations.urls', namespace='geonode.invitations')), - url(r'^i18n/', include(django.conf.urls.i18n), name="i18n"), - url(r'^jsi18n/$', JavaScriptCatalog.as_view(), {}, name='javascript-catalog'), - url(r'^(?P[^/]+)/embed$', map_embed, name='map_embed'), - url(r'^(?P[^/]+)/embed$', layer_embed, name='layer_embed'), - url(r'^(?P[^/]+)/embed$', geoapp_edit, {'template': 'apps/app_embed.html'}, name='geoapp_embed'), - ] + from geonode.urls import urlpatterns if check_ogc_backend(geoserver.BACKEND_PACKAGE): from geonode.geoserver.views import layer_acls, resolve_user diff --git a/geonode/layers/api/tests.py b/geonode/layers/api/tests.py index ffce091c6d7..ce0d3b21fee 100644 --- a/geonode/layers/api/tests.py +++ b/geonode/layers/api/tests.py @@ -17,21 +17,12 @@ # along with this program. If not, see . # ######################################################################### -import django import logging from django.urls import reverse -from django.conf.urls import url, include -from django.views.generic import TemplateView -from django.views.i18n import JavaScriptCatalog +from django.conf.urls import url from rest_framework.test import APITestCase, URLPatternsTestCase -from geonode.api.urls import router -from geonode.services.views import services -from geonode.maps.views import map_embed -from geonode.geoapps.views import geoapp_edit -from geonode.layers.views import layer_upload, layer_embed, layer_detail - from geonode import geoserver from geonode.layers.models import Layer from geonode.utils import check_ogc_backend @@ -48,47 +39,7 @@ class LayersApiTests(APITestCase, URLPatternsTestCase): 'default_oauth_apps.json' ] - urlpatterns = [ - url(r'^home/$', - TemplateView.as_view(template_name='index.html'), - name='home'), - url(r'^help/$', - TemplateView.as_view(template_name='help.html'), - name='help'), - url(r"^account/", include("allauth.urls")), - url(r'^people/', include('geonode.people.urls')), - url(r'^api/v2/', include(router.urls)), - url(r'^api/v2/', include('geonode.api.urls')), - url(r'^api/v2/api-auth/', include('rest_framework.urls', namespace='geonode_rest_framework')), - url(r'^upload$', layer_upload, name='layer_upload'), - url(r'^$', - TemplateView.as_view(template_name='layers/layer_list.html'), - {'facet_type': 'layers', 'is_layer': True}, - name='layer_browse'), - url(r'^$', - TemplateView.as_view(template_name='maps/map_list.html'), - {'facet_type': 'maps', 'is_map': True}, - name='maps_browse'), - url(r'^$', - TemplateView.as_view(template_name='documents/document_list.html'), - {'facet_type': 'documents', 'is_document': True}, - name='document_browse'), - url(r'^$', - TemplateView.as_view(template_name='groups/group_list.html'), - name='group_list'), - url(r'^search/$', - TemplateView.as_view(template_name='search/search.html'), - name='search'), - url(r'^$', services, name='services'), - url(r'^invitations/', include( - 'geonode.invitations.urls', namespace='geonode.invitations')), - url(r'^i18n/', include(django.conf.urls.i18n), name="i18n"), - url(r'^jsi18n/$', JavaScriptCatalog.as_view(), {}, name='javascript-catalog'), - url(r'^(?P[^/]+)/embed$', map_embed, name='map_embed'), - url(r'^(?P[^/]+)/embed$', layer_embed, name='layer_embed'), - url(r'^(?P[^/]*)$', layer_detail, name="layer_detail"), - url(r'^(?P[^/]+)/embed$', geoapp_edit, {'template': 'apps/app_embed.html'}, name='geoapp_embed'), - ] + from geonode.urls import urlpatterns if check_ogc_backend(geoserver.BACKEND_PACKAGE): from geonode.geoserver.views import layer_acls, resolve_user diff --git a/geonode/maps/api/tests.py b/geonode/maps/api/tests.py index 6703447f265..0b5e8845c36 100644 --- a/geonode/maps/api/tests.py +++ b/geonode/maps/api/tests.py @@ -17,7 +17,6 @@ # along with this program. If not, see . # ######################################################################### -import django import logging from urllib.parse import urljoin @@ -25,16 +24,9 @@ from django.urls import reverse from django.conf.urls import url, include -from django.views.generic import TemplateView -from django.views.i18n import JavaScriptCatalog from rest_framework.test import APITestCase, URLPatternsTestCase -from geonode.api.urls import router -from geonode.services.views import services from geonode.maps.models import Map -from geonode.maps.views import map_embed -from geonode.geoapps.views import geoapp_edit -from geonode.layers.views import layer_upload, layer_embed from geonode import geoserver from geonode.utils import check_ogc_backend @@ -51,46 +43,7 @@ class MapsApiTests(APITestCase, URLPatternsTestCase): 'default_oauth_apps.json' ] - urlpatterns = [ - url(r'^home/$', - TemplateView.as_view(template_name='index.html'), - name='home'), - url(r'^help/$', - TemplateView.as_view(template_name='help.html'), - name='help'), - url(r"^account/", include("allauth.urls")), - url(r'^people/', include('geonode.people.urls')), - url(r'^api/v2/', include(router.urls)), - url(r'^api/v2/', include('geonode.api.urls')), - url(r'^api/v2/api-auth/', include('rest_framework.urls', namespace='geonode_rest_framework')), - url(r'^upload$', layer_upload, name='layer_upload'), - url(r'^$', - TemplateView.as_view(template_name='layers/layer_list.html'), - {'facet_type': 'layers', 'is_layer': True}, - name='layer_browse'), - url(r'^$', - TemplateView.as_view(template_name='maps/map_list.html'), - {'facet_type': 'maps', 'is_map': True}, - name='maps_browse'), - url(r'^$', - TemplateView.as_view(template_name='documents/document_list.html'), - {'facet_type': 'documents', 'is_document': True}, - name='document_browse'), - url(r'^$', - TemplateView.as_view(template_name='groups/group_list.html'), - name='group_list'), - url(r'^search/$', - TemplateView.as_view(template_name='search/search.html'), - name='search'), - url(r'^$', services, name='services'), - url(r'^invitations/', include( - 'geonode.invitations.urls', namespace='geonode.invitations')), - url(r'^i18n/', include(django.conf.urls.i18n), name="i18n"), - url(r'^jsi18n/$', JavaScriptCatalog.as_view(), {}, name='javascript-catalog'), - url(r'^(?P[^/]+)/embed$', map_embed, name='map_embed'), - url(r'^(?P[^/]+)/embed$', layer_embed, name='layer_embed'), - url(r'^(?P[^/]+)/embed$', geoapp_edit, {'template': 'apps/app_embed.html'}, name='geoapp_embed'), - ] + from geonode.urls import urlpatterns if check_ogc_backend(geoserver.BACKEND_PACKAGE): from geonode.geoserver.views import layer_acls, resolve_user