diff --git a/tests/budgeting/test_views_integration.py b/tests/budgeting/test_views_integration.py index 66b2b8b47..c2acabc1f 100644 --- a/tests/budgeting/test_views_integration.py +++ b/tests/budgeting/test_views_integration.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target from apps.budgeting import phases diff --git a/tests/documents/test_document_api.py b/tests/documents/test_document_api.py index 3dee404bb..299d9b3e1 100644 --- a/tests/documents/test_document_api.py +++ b/tests/documents/test_document_api.py @@ -1,6 +1,6 @@ import django import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from rest_framework import status from apps.documents import models as document_models @@ -17,7 +17,7 @@ def test_anonymous_user_can_not_retrieve_chapter_list(apiclient, module): def test_anonymous_user_can_not_retrieve_chapter_detail( apiclient, chapter, module): # Assert that no detail route exists - with pytest.raises(django.core.urlresolvers.NoReverseMatch): + with pytest.raises(django.urls.exceptions.NoReverseMatch): url = reverse( 'chapters-detail', kwargs={'module_pk': module.pk, 'pk': chapter.pk} diff --git a/tests/documents/test_document_views.py b/tests/documents/test_document_views.py index febe4b30a..a1d2be959 100644 --- a/tests/documents/test_document_views.py +++ b/tests/documents/test_document_views.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target diff --git a/tests/ideas/test_idea_models.py b/tests/ideas/test_idea_models.py index 11a85653f..736722cfc 100644 --- a/tests/ideas/test_idea_models.py +++ b/tests/ideas/test_idea_models.py @@ -2,7 +2,7 @@ import pytest from django.conf import settings -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.comments import models as comments_models from adhocracy4.ratings import models as rating_models diff --git a/tests/ideas/test_views_integration.py b/tests/ideas/test_views_integration.py index 875d719e2..29748e7c9 100644 --- a/tests/ideas/test_views_integration.py +++ b/tests/ideas/test_views_integration.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target from apps.ideas import phases diff --git a/tests/ideas/views/test_idea_create.py b/tests/ideas/views/test_idea_create.py index 75bedd194..ca8fe92c4 100644 --- a/tests/ideas/views/test_idea_create.py +++ b/tests/ideas/views/test_idea_create.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target from apps.ideas import models diff --git a/tests/ideas/views/test_idea_delete.py b/tests/ideas/views/test_idea_delete.py index b053eb711..dae96a8ed 100644 --- a/tests/ideas/views/test_idea_delete.py +++ b/tests/ideas/views/test_idea_delete.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target from apps.ideas import models diff --git a/tests/ideas/views/test_idea_update.py b/tests/ideas/views/test_idea_update.py index dd914103a..38aa0f9c1 100644 --- a/tests/ideas/views/test_idea_update.py +++ b/tests/ideas/views/test_idea_update.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target from apps.ideas import models diff --git a/tests/mapideas/test_moderation_access.py b/tests/mapideas/test_moderation_access.py index a03346e89..69c2946d7 100644 --- a/tests/mapideas/test_moderation_access.py +++ b/tests/mapideas/test_moderation_access.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from apps.mapideas import phases from tests.factories import PhaseFactory diff --git a/tests/mapideas/test_views_integration.py b/tests/mapideas/test_views_integration.py index a496817e4..95a7a9a10 100644 --- a/tests/mapideas/test_views_integration.py +++ b/tests/mapideas/test_views_integration.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target from apps.mapideas import phases diff --git a/tests/mapideas/views/test_mapidea_create.py b/tests/mapideas/views/test_mapidea_create.py index a7175a8d2..f5e0d920c 100644 --- a/tests/mapideas/views/test_mapidea_create.py +++ b/tests/mapideas/views/test_mapidea_create.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target from apps.mapideas import models diff --git a/tests/mapideas/views/test_mapidea_delete.py b/tests/mapideas/views/test_mapidea_delete.py index b9e7881bc..cda1b8e91 100644 --- a/tests/mapideas/views/test_mapidea_delete.py +++ b/tests/mapideas/views/test_mapidea_delete.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target from apps.mapideas import models diff --git a/tests/mapideas/views/test_mapidea_update.py b/tests/mapideas/views/test_mapidea_update.py index 6a1d8ad46..f76b82629 100644 --- a/tests/mapideas/views/test_mapidea_update.py +++ b/tests/mapideas/views/test_mapidea_update.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.test.helpers import redirect_target from apps.mapideas import models diff --git a/tests/offlineevents/dashboard_components/test_views_project_offlineevents.py b/tests/offlineevents/dashboard_components/test_views_project_offlineevents.py index b4123c5b6..6346581f2 100644 --- a/tests/offlineevents/dashboard_components/test_views_project_offlineevents.py +++ b/tests/offlineevents/dashboard_components/test_views_project_offlineevents.py @@ -1,6 +1,6 @@ import pytest from dateutil.parser import parse -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.dashboard import components from adhocracy4.test.helpers import redirect_target diff --git a/tests/partners/test_partner_detail_view.py b/tests/partners/test_partner_detail_view.py index 97b3d7cbc..326b0a37e 100644 --- a/tests/partners/test_partner_detail_view.py +++ b/tests/partners/test_partner_detail_view.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from apps.partners import set_partner diff --git a/tests/partners/test_urlresolver.py b/tests/partners/test_urlresolver.py index b247507d6..839e699f3 100644 --- a/tests/partners/test_urlresolver.py +++ b/tests/partners/test_urlresolver.py @@ -46,7 +46,8 @@ def test_partner_patterns_instance_ns(partner_factory): auto_set_partner=False) set_partner(partner) urlconf = (partner_patterns( - url(r'^ns/', include(base_urlconf, namespace='instance-ns')) + url(r'^ns/', include((base_urlconf, 'instance-ns'), + namespace='instance-ns')) ),) url_ = reverse('instance-ns:static-url', urlconf) diff --git a/tests/projects/test_dashboard_delete_view.py b/tests/projects/test_dashboard_delete_view.py index c06893529..9674d746b 100644 --- a/tests/projects/test_dashboard_delete_view.py +++ b/tests/projects/test_dashboard_delete_view.py @@ -1,5 +1,5 @@ import pytest -from django.core.urlresolvers import reverse +from django.urls import reverse from adhocracy4.projects import models from adhocracy4.test.helpers import redirect_target @@ -36,7 +36,7 @@ def test_user_cannot_delete(client, project_factory, user): 'pk': project.pk }) response = client.post(url) - assert response.status_code == 302 + assert response.status_code == 403 count = models.Project.objects.all().count() assert count == 1 @@ -55,7 +55,7 @@ def test_moderator_cannot_delete(client, project_factory, user): 'pk': project.pk }) response = client.post(url) - assert response.status_code == 302 + assert response.status_code == 403 count = models.Project.objects.all().count() assert count == 1