github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-11-12 08:53:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

New fixes

Browse Source
This commit is contained in:
Antoine Nguyen
2025-02-18 15:54:59 +01:00
parent f202b702df
commit db0b7eb79d
133 changed files with 405 additions and 1165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/api/v1/tests.py
+9 -9
View File
@@ -161,7 +161,7 @@ class DomainAliasAPITestCase(ModoAPITestCase):
@classmethod
def setUpTestData(cls): # NOQA:N802
"""Create test data."""
super(DomainAliasAPITestCase, cls).setUpTestData()
super().setUpTestData()
factories.populate_database()
cls.dom_alias1 = factories.DomainAliasFactory(
name="dalias1.com", target__name="test.com"
@@ -185,7 +185,7 @@ class DomainAliasAPITestCase(ModoAPITestCase):
self.assertEqual(response.data["name"], "dalias1.com")
url = reverse("v1:domain_alias-list")
response = self.client.get("{}?domain=test.com".format(url))
response = self.client.get(f"{url}?domain=test.com")
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.data), 1)
@@ -246,7 +246,7 @@ class AccountAPITestCase(ModoAPITestCase):
@classmethod
def setUpTestData(cls): # NOQA:N802
"""Create test data."""
super(AccountAPITestCase, cls).setUpTestData()
super().setUpTestData()
factories.populate_database()
cls.da_token = Token.objects.create(
user=core_models.User.objects.get(username="admin@test.com")
@@ -271,17 +271,17 @@ class AccountAPITestCase(ModoAPITestCase):
response = response.json()
self.assertEqual(len(response), 5)
response = self.client.get("{}?domain=test.com".format(url))
response = self.client.get(f"{url}?domain=test.com")
self.assertEqual(response.status_code, 200)
response = response.json()
self.assertEqual(len(response), 2)
response = self.client.get("{}?domain=pouet.com".format(url))
response = self.client.get(f"{url}?domain=pouet.com")
self.assertEqual(response.status_code, 200)
response = response.json()
self.assertEqual(len(response), 0)
response = self.client.get("{}?search=user@test.com".format(url))
response = self.client.get(f"{url}?search=user@test.com")
self.assertEqual(response.status_code, 200)
response = response.json()
self.assertEqual(len(response), 1)
@@ -608,7 +608,7 @@ class AliasAPITestCase(ModoAPITestCase):
@classmethod
def setUpTestData(cls): # NOQA:N802
"""Create test data."""
super(AliasAPITestCase, cls).setUpTestData()
super().setUpTestData()
cls.localconfig.parameters.set_value("enable_admin_limits", False, app="limits")
cls.localconfig.save()
factories.populate_database()
@@ -624,7 +624,7 @@ class AliasAPITestCase(ModoAPITestCase):
response = response.json()
self.assertEqual(len(response), 3)
response = self.client.get("{}?domain=test.com".format(url))
response = self.client.get(f"{url}?domain=test.com")
self.assertEqual(response.status_code, 200)
response = response.json()
self.assertEqual(len(response), 3)
@@ -744,7 +744,7 @@ class SenderAddressAPITestCase(ModoAPITestCase):
@classmethod
def setUpTestData(cls): # NOQA:N802
"""Create test data."""
super(SenderAddressAPITestCase, cls).setUpTestData()
super().setUpTestData()
cls.localconfig.parameters.set_value("enable_admin_limits", False, app="limits")
cls.localconfig.save()
factories.populate_database()
modoboa/admin/api/v2/serializers.py
+2 -4
View File
@@ -136,7 +136,7 @@ class DomainSerializer(v1_serializers.DomainSerializer):
core_signals.can_create_object.send(
self.__class__, context=user, klass=models.Alias
)
address = "postmaster@{}".format(domain.name)
address = f"postmaster@{domain.name}"
alias = models.Alias.objects.create(
address=address, domain=domain, enabled=True
)
@@ -364,9 +364,7 @@ class AccountMeSerializer(v1_serializers.AccountSerializer):
permissions = (
user.user_permissions.all() | Permission.objects.filter(group__user=user)
).select_related("content_type")
return [
"{}.{}".format(p.content_type.app_label, p.codename) for p in permissions
]
return [f"{p.content_type.app_label}.{p.codename}" for p in permissions]
class AccountSerializer(v1_serializers.AccountSerializer):