From 7cca19383c78569302e6b356c8a1b835650b9b8d Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 13 Nov 2025 15:56:48 +0100 Subject: [PATCH] Fixed issues with tests --- modoboa/admin/api/v1/tests.py | 5 +++++ modoboa/admin/api/v1/viewsets.py | 2 +- modoboa/admin/api/v2/viewsets.py | 2 +- modoboa/admin/tests/test_repair.py | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modoboa/admin/api/v1/tests.py b/modoboa/admin/api/v1/tests.py index 2b8963b9b..fcb838b15 100644 --- a/modoboa/admin/api/v1/tests.py +++ b/modoboa/admin/api/v1/tests.py @@ -647,6 +647,11 @@ class AliasAPITestCase(ModoAPITestCase): response = response.json() self.assertEqual(len(response), 3) + response = self.client.get(f"{url}?domain=test2.com") + self.assertEqual(response.status_code, 200) + response = response.json() + self.assertEqual(len(response), 0) + def test_get_alias(self): """Retrieve an alias.""" al = models.Alias.objects.get(address="alias@test.com") diff --git a/modoboa/admin/api/v1/viewsets.py b/modoboa/admin/api/v1/viewsets.py index b1dc5aa84..3697b3ef8 100644 --- a/modoboa/admin/api/v1/viewsets.py +++ b/modoboa/admin/api/v1/viewsets.py @@ -196,7 +196,7 @@ class AliasFilter(dj_filters.FilterSet): domain = dj_filters.ModelChoiceFilter( queryset=lambda request: models.Domain.objects.get_for_admin(request.user), - field_name="mailbox__domain", + to_field_name="name", ) class Meta: diff --git a/modoboa/admin/api/v2/viewsets.py b/modoboa/admin/api/v2/viewsets.py index 306f0bcb3..57a2df889 100644 --- a/modoboa/admin/api/v2/viewsets.py +++ b/modoboa/admin/api/v2/viewsets.py @@ -279,7 +279,7 @@ class AliasFilter(dj_filters.FilterSet): domain = dj_filters.ModelChoiceFilter( queryset=lambda request: models.Domain.objects.get_for_admin(request.user), - field_name="domain__name", + to_field_name="name", ) class Meta: diff --git a/modoboa/admin/tests/test_repair.py b/modoboa/admin/tests/test_repair.py index 3a23901c3..08c4affb9 100644 --- a/modoboa/admin/tests/test_repair.py +++ b/modoboa/admin/tests/test_repair.py @@ -20,7 +20,7 @@ class RepairTestCase(ModoTestCase): """Check that command works fine.""" ObjectAccess.objects.all().delete() mbox = models.Mailbox.objects.first() - alias = models.Alias.objects.first() + alias = models.Alias.objects.filter(internal=False).first() # assert mbox has no owner self.assertIs(get_object_owner(mbox), None) # fix it. run in quiet mode because we dont want output in tests @@ -53,7 +53,7 @@ class RepairTestCase(ModoTestCase): count, detail = models.Alias.objects.filter( address="user@test.com", internal=True ).delete() - self.assertEqual(count, 3) + self.assertEqual(count, 2) ret = management.call_command("modo", "repair", "--quiet") assert ret is None self.assertTrue(