From 981ff48c13adf98759fb98da7446d0f43418e5bf Mon Sep 17 00:00:00 2001 From: patrick Date: Thu, 18 Nov 2021 15:04:14 +0000 Subject: [PATCH] cleanup --- fet2020/members/models.py | 2 +- fet2020/members/tests.py | 18 +++++++++--------- fet2020/members/validators.py | 4 +++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/fet2020/members/models.py b/fet2020/members/models.py index 4673c13e..5dcfd68e 100644 --- a/fet2020/members/models.py +++ b/fet2020/members/models.py @@ -40,7 +40,7 @@ class Member(models.Model): max_length=128, validators=[validate_email, validate_domainonly_email], error_messages={ - 'unique': _("Diese Mailadresse existiert schon."), + "unique": _("Diese Mailadresse existiert schon."), }, ) diff --git a/fet2020/members/tests.py b/fet2020/members/tests.py index dbb89903..aff6ac84 100644 --- a/fet2020/members/tests.py +++ b/fet2020/members/tests.py @@ -9,6 +9,7 @@ from .forms import MemberForm, JobForm, JobGroupForm image_path = os.path.join(os.path.dirname(__file__), "tests/files/peter.jpg") + class MemberTestCase(TestCase): def setUp(self): member = Member() @@ -89,8 +90,7 @@ class MemberFormTestCase(TestCase): self.assertFalse(form.is_valid()) self.assertEqual( - form.errors.as_data()['__all__'][0].message, - "Es fehlt das Profilbild." + form.errors.as_data()["__all__"][0].message, "Es fehlt das Profilbild." ) def test_form_wrong_mailaccount(self): @@ -113,8 +113,8 @@ class MemberFormTestCase(TestCase): self.assertFalse(form.is_valid()) self.assertEqual( - form.errors.as_data()['mailaccount'][0].message, - "In der Mailadresse fehlt die richtige Domäne." + form.errors.as_data()["mailaccount"][0].message, + "In der Mailadresse fehlt die richtige Domäne.", ) def test_form_wrong_domain(self): @@ -137,8 +137,8 @@ class MemberFormTestCase(TestCase): self.assertFalse(form.is_valid()) self.assertEqual( - form.errors.as_data()['mailaccount'][0].message, - "Gib eine gültige E-Mail Adresse an." + form.errors.as_data()["mailaccount"][0].message, + "Gib eine gültige E-Mail Adresse an.", ) def test_form_wrong_phone_number(self): @@ -160,11 +160,11 @@ class MemberFormTestCase(TestCase): files={"image": image}, ) - self.assertFalse(form.is_valid()) + self.assertFalse(form.is_valid()) self.assertEqual( - form.errors.as_data()['phone'][0].message, + form.errors.as_data()["phone"][0].message, "Telefonnummer muss in diesem Format +999999999999 eingegeben werden. " - "Bis zu 15 Zahlen sind erlaubt." + "Bis zu 15 Zahlen sind erlaubt.", ) diff --git a/fet2020/members/validators.py b/fet2020/members/validators.py index 9d3c3f80..a2fd8b89 100644 --- a/fet2020/members/validators.py +++ b/fet2020/members/validators.py @@ -16,10 +16,12 @@ def validate_domainonly_email(value): if not "fet.at" in value: raise ValidationError(_("In der Mailadresse fehlt die richtige Domäne.")) + def validate_file_size(value): if value.size > 10 * 1024 * 1024: raise ValidationError(_("Die maximale Dateigröße ist 10MB.")) + def validate_image_dimension(value): if value.height < 150 or value.width < 150: raise ValidationError( @@ -27,5 +29,5 @@ def validate_image_dimension(value): params={ "height": value.height, "width": value.width, - } + }, )