From 71b2ba959af5039e57c769538330db7028e1b64c Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 20 Mar 2024 11:17:17 +0100 Subject: [PATCH] DRF 3.15 compatibility --- modoboa/admin/api/v2/tests.py | 2 +- modoboa/admin/api/v2/urls.py | 2 +- modoboa/postfix_autoreply/api/v2/tests.py | 6 ++++-- requirements.txt | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modoboa/admin/api/v2/tests.py b/modoboa/admin/api/v2/tests.py index fa95f5f0d..0efcd8c8e 100644 --- a/modoboa/admin/api/v2/tests.py +++ b/modoboa/admin/api/v2/tests.py @@ -523,7 +523,7 @@ class UserAccountViewSetTestCase(ModoAPITestCase): def test_forward(self): self.client.credentials(HTTP_AUTHORIZATION="Token " + self.da_token.key) - url = reverse("v2:account-forward") + url = reverse("v2:user_account-forward") resp = self.client.get(url) self.assertEqual(resp.status_code, 200) self.assertNotIn("recipients", resp.json()) diff --git a/modoboa/admin/api/v2/urls.py b/modoboa/admin/api/v2/urls.py index e85b08726..f3037877f 100644 --- a/modoboa/admin/api/v2/urls.py +++ b/modoboa/admin/api/v2/urls.py @@ -17,7 +17,7 @@ router.register( r"senderaddresses", v1_viewsets.SenderAddressViewSet, basename="sender_address" ) router.register(r"identities", viewsets.IdentityViewSet, basename="identities") -router.register(r"account", viewsets.UserAccountViewSet, basename="account") +router.register(r"account", viewsets.UserAccountViewSet, basename="user_account") router.register(r"alarms", viewsets.AlarmViewSet, basename="alarm") urlpatterns = router.urls diff --git a/modoboa/postfix_autoreply/api/v2/tests.py b/modoboa/postfix_autoreply/api/v2/tests.py index a17d9f1f7..782934838 100644 --- a/modoboa/postfix_autoreply/api/v2/tests.py +++ b/modoboa/postfix_autoreply/api/v2/tests.py @@ -156,12 +156,14 @@ class AccountARMessageViewSetTestCase(ModoAPITestCase): self.client.logout() self.client.force_login(self.account) url = reverse("api:account_armessage-armessage") + fromdate = timezone.now() + todate = fromdate + relativedelta(days=4) data = { "enabled": True, "subject": "Je suis absent", "content": "Je reviendrai", - "fromdate": "2024-03-16T10:00", - "untildate": "2024-03-18T10:00", + "fromdate": fromdate.isoformat(), + "untildate": todate.isoformat(), } response = self.client.put(url, data, format="json") self.assertEqual(response.status_code, 200) diff --git a/requirements.txt b/requirements.txt index 4459b1936..604f6f27e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ django-rename-app==0.1.7 dj-database-url -djangorestframework>=3.14,<3.15 +djangorestframework>=3.14,<3.16 drf-spectacular uritemplate djangorestframework-simplejwt==5.3.1