diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3aee8f4..66b6c44 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,3 +3,8 @@ repos: rev: v5.0.0 hooks: - id: check-merge-conflict + + - repo: https://github.com/adamchainz/django-upgrade + rev: 1.29.1 + hooks: + - id: django-upgrade diff --git a/cookie_consent/admin.py b/cookie_consent/admin.py index a737d3e..6dc0e64 100644 --- a/cookie_consent/admin.py +++ b/cookie_consent/admin.py @@ -9,6 +9,7 @@ from .models import Cookie, CookieGroup, LogItem +@admin.register(Cookie) class CookieAdmin(admin.ModelAdmin): list_display = ("varname", "name", "cookiegroup", "path", "domain", "get_version") search_fields = ("name", "domain", "cookiegroup__varname", "cookiegroup__name") @@ -16,6 +17,7 @@ class CookieAdmin(admin.ModelAdmin): list_filter = ("cookiegroup",) +@admin.register(CookieGroup) class CookieGroupAdmin(admin.ModelAdmin): list_display = ( "varname", @@ -58,7 +60,5 @@ class LogItemAdmin(admin.ModelAdmin): date_hierarchy = "created" -admin.site.register(Cookie, CookieAdmin) -admin.site.register(CookieGroup, CookieGroupAdmin) if settings.COOKIE_CONSENT_LOG_ENABLED: admin.site.register(LogItem, LogItemAdmin) diff --git a/tests/test_middleware.py b/tests/test_middleware.py index 58a80fe..65459e8 100644 --- a/tests/test_middleware.py +++ b/tests/test_middleware.py @@ -37,7 +37,7 @@ def _accept_and_set_cookie(self): consent_response = self.client.post( endpoint, follow=True, - HTTP_X_REQUESTED_WITH="XMLHttpRequest", + headers={"x-requested-with": "XMLHttpRequest"}, ) self.assertEqual(consent_response.status_code, 200) diff --git a/tests/test_views.py b/tests/test_views.py index 4fe695d..c27b740 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -76,7 +76,7 @@ def test_accept_cookie(self): def test_accept_cookie_ajax(self): response = self.client.post( reverse("cookie_consent_accept", kwargs={"varname": "optional"}), - HTTP_X_REQUESTED_WITH="XMLHttpRequest", + headers={"x-requested-with": "XMLHttpRequest"}, ) self.assertEqual(response.status_code, 200) @@ -93,7 +93,7 @@ def test_decline_cookie(self): def test_decline_cookie_ajax(self): response = self.client.delete( reverse("cookie_consent_decline", kwargs={"varname": "optional"}), - HTTP_X_REQUESTED_WITH="XMLHttpRequest", + headers={"x-requested-with": "XMLHttpRequest"}, ) self.assertEqual(response.status_code, 200)