bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Patrick Mayr
2021-11-18 15:04:14 +00:00
parent 7e6d9ebf76
commit 981ff48c13
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fet2020/members/models.py
View File

@@ -40,7 +40,7 @@ class Member(models.Model):
max_length=128, max_length=128,
validators=[validate_email, validate_domainonly_email], validators=[validate_email, validate_domainonly_email],
error_messages={ error_messages={
'unique': _("Diese Mailadresse existiert schon."), "unique": _("Diese Mailadresse existiert schon."),
}, },
) )

18
fet2020/members/tests.py
View File

@@ -9,6 +9,7 @@ from .forms import MemberForm, JobForm, JobGroupForm
image_path = os.path.join(os.path.dirname(__file__), "tests/files/peter.jpg") image_path = os.path.join(os.path.dirname(__file__), "tests/files/peter.jpg")
class MemberTestCase(TestCase): class MemberTestCase(TestCase):
def setUp(self): def setUp(self):
member = Member() member = Member()
@@ -89,8 +90,7 @@ class MemberFormTestCase(TestCase):
self.assertFalse(form.is_valid()) self.assertFalse(form.is_valid())
self.assertEqual( self.assertEqual(
form.errors.as_data()['__all__'][0].message, form.errors.as_data()["__all__"][0].message, "Es fehlt das Profilbild."
"Es fehlt das Profilbild."
) )
def test_form_wrong_mailaccount(self): def test_form_wrong_mailaccount(self):
@@ -113,8 +113,8 @@ class MemberFormTestCase(TestCase):
self.assertFalse(form.is_valid()) self.assertFalse(form.is_valid())
self.assertEqual( self.assertEqual(
form.errors.as_data()['mailaccount'][0].message, form.errors.as_data()["mailaccount"][0].message,
"In der Mailadresse fehlt die richtige Domäne." "In der Mailadresse fehlt die richtige Domäne.",
) )
def test_form_wrong_domain(self): def test_form_wrong_domain(self):
@@ -137,8 +137,8 @@ class MemberFormTestCase(TestCase):
self.assertFalse(form.is_valid()) self.assertFalse(form.is_valid())
self.assertEqual( self.assertEqual(
form.errors.as_data()['mailaccount'][0].message, form.errors.as_data()["mailaccount"][0].message,
"Gib eine gültige E-Mail Adresse an." "Gib eine gültige E-Mail Adresse an.",
) )
def test_form_wrong_phone_number(self): def test_form_wrong_phone_number(self):
@@ -160,11 +160,11 @@ class MemberFormTestCase(TestCase):
files={"image": image}, files={"image": image},
) )
self.assertFalse(form.is_valid()) self.assertFalse(form.is_valid())
self.assertEqual( self.assertEqual(
form.errors.as_data()['phone'][0].message, form.errors.as_data()["phone"][0].message,
"Telefonnummer muss in diesem Format +999999999999 eingegeben werden. " "Telefonnummer muss in diesem Format +999999999999 eingegeben werden. "
"Bis zu 15 Zahlen sind erlaubt." "Bis zu 15 Zahlen sind erlaubt.",
) )

4
fet2020/members/validators.py
View File

@@ -16,10 +16,12 @@ def validate_domainonly_email(value):
if not "fet.at" in value: if not "fet.at" in value:
raise ValidationError(_("In der Mailadresse fehlt die richtige Domäne.")) raise ValidationError(_("In der Mailadresse fehlt die richtige Domäne."))
def validate_file_size(value): def validate_file_size(value):
if value.size > 10 * 1024 * 1024: if value.size > 10 * 1024 * 1024:
raise ValidationError(_("Die maximale Dateigröße ist 10MB.")) raise ValidationError(_("Die maximale Dateigröße ist 10MB."))
def validate_image_dimension(value): def validate_image_dimension(value):
if value.height < 150 or value.width < 150: if value.height < 150 or value.width < 150:
raise ValidationError( raise ValidationError(
@@ -27,5 +29,5 @@ def validate_image_dimension(value):
params={ params={
"height": value.height, "height": value.height,
"width": value.width, "width": value.width,
} },
) )