tests: Various fixes for Django 2.2

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

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}

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
 

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

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

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

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

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

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

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

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

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

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

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

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
 

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)

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