⬆️ Bump to Django 3.2, update tests

maykinmedia · Jan 17, 2024 · d96386f · d96386f
1 parent 163f381
commit d96386f
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 36 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -8,7 +8,7 @@ python-decouple  # processing of envvar configs
 jsonschema
 
 # Framework libraries
-django < 3
+django~=3.2
 django-admin-index
 django-axes
 django-choices

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,6 +4,8 @@
 #
 #    pip-compile --no-emit-index-url requirements/base.in
 #
+asgiref==3.7.2
+    # via django
 attrs==20.3.0
     # via
     #   glom
@@ -72,7 +74,7 @@ django-solo==1.1.5
     #   mozilla-django-oidc-db
     #   vng-api-common
     #   zgw-consumers
-django==2.2.28
+django==3.2.23
     # via
     #   -r requirements/base.in
     #   django-axes
@@ -235,6 +237,8 @@ sqlparse==0.4.2
     # via django
 text-unidecode==1.3
     # via faker
+typing-extensions==4.9.0
+    # via asgiref
 uritemplate==3.0.1
     # via
     #   coreapi

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -4,6 +4,10 @@
 #
 #    pip-compile --no-emit-index-url --output-file=requirements/ci.txt requirements/base.txt requirements/test-tools.in
 #
+asgiref==3.7.2
+    # via
+    #   -r requirements/base.txt
+    #   django
 attrs==20.3.0
     # via
     #   -r requirements/base.txt
@@ -57,8 +61,6 @@ django-better-admin-arrayfield==1.4.2
     # via
     #   -r requirements/base.txt
     #   mozilla-django-oidc-db
-django-capture-on-commit-callbacks==1.5.0
-    # via -r requirements/test-tools.in
 django-choices==1.7.2
     # via
     #   -r requirements/base.txt
@@ -112,11 +114,10 @@ django-solo==1.1.5
     #   zgw-consumers
 django-webtest==1.9.7
     # via -r requirements/test-tools.in
-django==2.2.28
+django==3.2.23
     # via
     #   -r requirements/base.txt
     #   django-axes
-    #   django-capture-on-commit-callbacks
     #   django-choices
     #   django-filter
     #   django-formtools
@@ -355,6 +356,10 @@ text-unidecode==1.3
     # via
     #   -r requirements/base.txt
     #   faker
+typing-extensions==4.9.0
+    # via
+    #   -r requirements/base.txt
+    #   asgiref
 uritemplate==3.0.1
     # via
     #   -r requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -6,6 +6,10 @@
 #
 alabaster==0.7.12
     # via sphinx
+asgiref==3.7.2
+    # via
+    #   -r requirements/ci.txt
+    #   django
 attrs==20.3.0
     # via
     #   -r requirements/ci.txt
@@ -77,8 +81,6 @@ django-better-admin-arrayfield==1.4.2
     # via
     #   -r requirements/ci.txt
     #   mozilla-django-oidc-db
-django-capture-on-commit-callbacks==1.5.0
-    # via -r requirements/ci.txt
 django-choices==1.7.2
     # via
     #   -r requirements/ci.txt
@@ -136,11 +138,10 @@ django-solo==1.1.5
     #   zgw-consumers
 django-webtest==1.9.7
     # via -r requirements/ci.txt
-django==2.2.28
+django==3.2.23
     # via
     #   -r requirements/ci.txt
     #   django-axes
-    #   django-capture-on-commit-callbacks
     #   django-choices
     #   django-debug-toolbar
     #   django-extensions
@@ -458,7 +459,10 @@ toml==0.10.2
 tomli==2.0.1
     # via black
 typing-extensions==4.9.0
-    # via black
+    # via
+    #   -r requirements/ci.txt
+    #   asgiref
+    #   black
 uritemplate==3.0.1
     # via
     #   -r requirements/ci.txt

diff --git a/requirements/test-tools.in b/requirements/test-tools.in
@@ -1,6 +1,5 @@
 # Dependencies only relevant for (unit) testing
 coverage < 5.0
-django_capture_on_commit_callbacks
 django-webtest
 factory-boy
 freezegun

diff --git a/src/objects/conf/base.py b/src/objects/conf/base.py
@@ -45,6 +45,8 @@
     }
 }
 
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
 # Application definition
 
 INSTALLED_APPS = [

diff --git a/src/objects/tests/v1/test_auth_fields.py b/src/objects/tests/v1/test_auth_fields.py
@@ -53,7 +53,7 @@ def test_retrieve_without_query(self):
             },
         )
         self.assertEqual(
-            set(response._headers["x-unauthorized-fields"][1].split(",")),
+            set(response.headers["x-unauthorized-fields"].split(",")),
             {
                 "uuid",
                 "record__data__name",
@@ -91,7 +91,7 @@ def test_retrieve_with_query_fields(self):
                 "record": {"data": {"name": record.data["name"]}},
             },
         )
-        self.assertNotIn("x-unauthorized-fields", response._headers)
+        self.assertNotIn("x-unauthorized-fields", response.headers)
 
     def test_retrieve_incorrect_auth_fields(self):
         PermissionFactory.create(
@@ -139,7 +139,7 @@ def test_retrieve_query_fields_not_allowed(self):
             },
         )
         self.assertEqual(
-            response._headers["x-unauthorized-fields"][1], "record__data__desc"
+            response.headers["x-unauthorized-fields"], "record__data__desc"
         )
 
     def test_retrieve_no_allowed_fields(self):
@@ -160,7 +160,7 @@ def test_retrieve_no_allowed_fields(self):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.json(), {})
-        self.assertIn("x-unauthorized-fields", response._headers)
+        self.assertIn("x-unauthorized-fields", response.headers)
 
 
 class ListAuthFieldsTests(TokenAuthMixin, APITestCase):
@@ -236,7 +236,7 @@ def test_list_without_query_different_object_types(self):
             ],
         )
         self.assertEqual(
-            response._headers["x-unauthorized-fields"][1],
+            response.headers["x-unauthorized-fields"],
             f"{self.other_object_type.url}(1)=type; {self.object_type.url}(1)=uuid",
         )
 
@@ -283,7 +283,7 @@ def test_list_with_query_fields(self):
                 },
             ],
         )
-        self.assertNotIn("x-unauthorized-fields", response._headers)
+        self.assertNotIn("x-unauthorized-fields", response.headers)
 
     def test_list_incorrect_auth_fields(self):
         PermissionFactory.create(
@@ -376,7 +376,7 @@ def test_list_no_allowed_fields(self):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.json(), [{}, {}])
-        self.assertIn("x-unauthorized-fields", response._headers)
+        self.assertIn("x-unauthorized-fields", response.headers)
 
 
 class SearchAuthFieldsTests(TokenAuthMixin, APITestCase):

diff --git a/src/objects/tests/v1/test_notifications_send.py b/src/objects/tests/v1/test_notifications_send.py
@@ -3,7 +3,6 @@
 from django.test import override_settings
 
 import requests_mock
-from django_capture_on_commit_callbacks import capture_on_commit_callbacks
 from freezegun import freeze_time
 from rest_framework import status
 from rest_framework.test import APITestCase
@@ -89,7 +88,7 @@ def test_send_notif_create_object(self, mocker, mock_client):
             },
         }
 
-        with capture_on_commit_callbacks(execute=True):
+        with self.captureOnCommitCallbacks(execute=True):
             response = self.client.post(url, data, **GEO_WRITE_KWARGS)
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED, response.data)
@@ -141,7 +140,7 @@ def test_send_notif_update_object(self, mocker, mock_client):
             },
         }
 
-        with capture_on_commit_callbacks(execute=True):
+        with self.captureOnCommitCallbacks(execute=True):
             response = self.client.put(url, data, **GEO_WRITE_KWARGS)
 
         self.assertEqual(response.status_code, status.HTTP_200_OK, response.data)
@@ -193,7 +192,7 @@ def test_send_notif_partial_update_object(self, mocker, mock_client):
             },
         }
 
-        with capture_on_commit_callbacks(execute=True):
+        with self.captureOnCommitCallbacks(execute=True):
             response = self.client.patch(url, data, **GEO_WRITE_KWARGS)
 
         self.assertEqual(response.status_code, status.HTTP_200_OK, response.data)
@@ -232,7 +231,7 @@ def test_send_notif_delete_object(self, mocker, mock_client):
         url = reverse("object-detail", args=[obj.uuid])
         full_url = f"http://testserver{url}"
 
-        with capture_on_commit_callbacks(execute=True):
+        with self.captureOnCommitCallbacks(execute=True):
             response = self.client.delete(url, **GEO_WRITE_KWARGS)
 
         self.assertEqual(

diff --git a/src/objects/tests/v2/test_auth_fields.py b/src/objects/tests/v2/test_auth_fields.py
@@ -53,7 +53,7 @@ def test_retrieve_without_query(self):
             },
         )
         self.assertEqual(
-            set(response._headers["x-unauthorized-fields"][1].split(",")),
+            set(response.headers["x-unauthorized-fields"].split(",")),
             {
                 "uuid",
                 "record__data__name",
@@ -91,7 +91,7 @@ def test_retrieve_with_query_fields(self):
                 "record": {"data": {"name": record.data["name"]}},
             },
         )
-        self.assertNotIn("x-unauthorized-fields", response._headers)
+        self.assertNotIn("x-unauthorized-fields", response.headers)
 
     def test_retrieve_incorrect_auth_fields(self):
         PermissionFactory.create(
@@ -139,7 +139,7 @@ def test_retrieve_query_fields_not_allowed(self):
             },
         )
         self.assertEqual(
-            response._headers["x-unauthorized-fields"][1], "record__data__desc"
+            response.headers["x-unauthorized-fields"], "record__data__desc"
         )
 
     def test_retrieve_no_allowed_fields(self):
@@ -160,7 +160,7 @@ def test_retrieve_no_allowed_fields(self):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.json(), {})
-        self.assertIn("x-unauthorized-fields", response._headers)
+        self.assertIn("x-unauthorized-fields", response.headers)
 
 
 class ListAuthFieldsTests(TokenAuthMixin, APITestCase):
@@ -236,7 +236,7 @@ def test_list_without_query_different_object_types(self):
             ],
         )
         self.assertEqual(
-            response._headers["x-unauthorized-fields"][1],
+            response.headers["x-unauthorized-fields"],
             f"{self.other_object_type.url}(1)=type; {self.object_type.url}(1)=uuid",
         )
 
@@ -283,7 +283,7 @@ def test_list_with_query_fields(self):
                 },
             ],
         )
-        self.assertNotIn("x-unauthorized-fields", response._headers)
+        self.assertNotIn("x-unauthorized-fields", response.headers)
 
     def test_list_incorrect_auth_fields(self):
         PermissionFactory.create(
@@ -378,7 +378,7 @@ def test_list_no_allowed_fields(self):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.json()["results"], [{}, {}])
-        self.assertIn("x-unauthorized-fields", response._headers)
+        self.assertIn("x-unauthorized-fields", response.headers)
 
 
 class SearchAuthFieldsTests(TokenAuthMixin, APITestCase):

diff --git a/src/objects/tests/v2/test_notifications_send.py b/src/objects/tests/v2/test_notifications_send.py
@@ -3,7 +3,6 @@
 from django.test import override_settings
 
 import requests_mock
-from django_capture_on_commit_callbacks import capture_on_commit_callbacks
 from freezegun import freeze_time
 from rest_framework import status
 from rest_framework.test import APITestCase
@@ -89,7 +88,7 @@ def test_send_notif_create_object(self, mocker, mock_client):
             },
         }
 
-        with capture_on_commit_callbacks(execute=True):
+        with self.captureOnCommitCallbacks(execute=True):
             response = self.client.post(url, data, **GEO_WRITE_KWARGS)
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED, response.data)
@@ -141,7 +140,7 @@ def test_send_notif_update_object(self, mocker, mock_client):
             },
         }
 
-        with capture_on_commit_callbacks(execute=True):
+        with self.captureOnCommitCallbacks(execute=True):
             response = self.client.put(url, data, **GEO_WRITE_KWARGS)
 
         self.assertEqual(response.status_code, status.HTTP_200_OK, response.data)
@@ -193,7 +192,7 @@ def test_send_notif_partial_update_object(self, mocker, mock_client):
             },
         }
 
-        with capture_on_commit_callbacks(execute=True):
+        with self.captureOnCommitCallbacks(execute=True):
             response = self.client.patch(url, data, **GEO_WRITE_KWARGS)
 
         self.assertEqual(response.status_code, status.HTTP_200_OK, response.data)
@@ -232,7 +231,7 @@ def test_send_notif_delete_object(self, mocker, mock_client):
         url = reverse("object-detail", args=[obj.uuid])
         full_url = f"http://testserver{url}"
 
-        with capture_on_commit_callbacks(execute=True):
+        with self.captureOnCommitCallbacks(execute=True):
             response = self.client.delete(url, **GEO_WRITE_KWARGS)
 
         self.assertEqual(
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 +45,8 @@ @@
         }
     }
+    DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
     # Application definition
     INSTALLED_APPS = [
@@ Expand Down @@