From: Stephen Finucane Date: Mon, 29 May 2017 14:42:45 +0000 (+0100) Subject: tests: Configure User.first_name, User.last_name X-Git-Tag: v2.2.0-rc1~165 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04f382b79322d981138a67693777da791b704749;p=thirdparty%2Fpatchwork.git tests: Configure User.first_name, User.last_name 'User.name' is not a valid attribute. This also highlights a small issue with the existing tests. Signed-off-by: Stephen Finucane --- diff --git a/patchwork/tests/api/test_person.py b/patchwork/tests/api/test_person.py index 6bd3cb67..2139574b 100644 --- a/patchwork/tests/api/test_person.py +++ b/patchwork/tests/api/test_person.py @@ -32,7 +32,7 @@ class TestPersonAPI(utils.APITestCase): self.assertEqual(person_obj.name, person_json['name']) self.assertEqual(person_obj.email, person_json['email']) else: - self.assertEqual(person_obj.user.username, person_json['name']) + self.assertEqual(person_obj.user.profile.name, person_json['name']) self.assertEqual(person_obj.user.email, person_json['email']) # nested fields self.assertEqual(person_obj.user.id, diff --git a/patchwork/tests/utils.py b/patchwork/tests/utils.py index 5ebc933b..4ac9afe0 100644 --- a/patchwork/tests/utils.py +++ b/patchwork/tests/utils.py @@ -89,15 +89,22 @@ def create_user(link_person=True, **kwargs): values = { 'username': 'test_user_%d' % num, - 'name': 'test_user_%d' % num, 'email': 'test_user_%d@example.com' % num, + 'first_name': 'Tester', + 'last_name': 'Num%d' % num, } values.update(kwargs) + # this one must be done rather specifically user = User.objects.create_user(values['username'], values['email'], - values['name']) + values['username'], + first_name=values['first_name'], + last_name=values['last_name']) if link_person: + # unfortunately we don't split on these + values['name'] = ' '.join([values.pop('first_name'), + values.pop('last_name')]) values.pop('username') create_person(user=user, **values)