Get rid of User.givenname and User.familyname

This commit is contained in:
Raphael Michel
2017-01-07 16:35:04 +01:00
parent 33265d05fb
commit 0acee0e362
7 changed files with 85 additions and 49 deletions

View File

@@ -23,22 +23,12 @@ from pretix.base.services.orders import (
class UserTestCase(TestCase):
def test_name(self):
u = User.objects.create_user('test@foo.bar', 'test')
u.givenname = "Christopher"
u.familyname = "Nolan"
u.fullname = "Christopher Nolan"
u.set_password("test")
u.save()
self.assertEqual(u.get_full_name(), 'Nolan, Christopher')
self.assertEqual(u.get_short_name(), 'Christopher')
u.givenname = None
u.save()
self.assertEqual(u.get_full_name(), 'Nolan')
self.assertEqual(u.get_short_name(), 'Nolan')
u.givenname = "Christopher"
u.familyname = None
u.save()
self.assertEqual(u.get_full_name(), 'Christopher')
self.assertEqual(u.get_short_name(), 'Christopher')
u.givenname = None
self.assertEqual(u.get_full_name(), 'Christopher Nolan')
self.assertEqual(u.get_short_name(), 'Christopher Nolan')
u.fullname = None
u.save()
self.assertEqual(u.get_full_name(), 'test@foo.bar')
self.assertEqual(u.get_short_name(), 'test@foo.bar')

View File

@@ -26,13 +26,11 @@ class UserSettingsTest(SoupTest):
def test_set_name(self):
doc = self.save({
'givenname': 'Peter',
'familyname': 'Miller'
'fullname': 'Peter Miller',
})
assert doc.select(".alert-success")
self.user = User.objects.get(pk=self.user.pk)
assert self.user.givenname == 'Peter'
assert self.user.familyname == 'Miller'
assert self.user.fullname == 'Peter Miller'
def test_change_email_require_password(self):
doc = self.save({