summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <stephen@that.guru>2017-05-29 15:42:45 +0100
committerStephen Finucane <stephen@that.guru>2018-12-25 19:59:39 +0000
commit04f382b79322d981138a67693777da791b704749 (patch)
treef370ac3bb640b2f7142e6da626d11c140d4343c8
parent2782fcfd581bd32e050c9237de29f00cd5d7a89e (diff)
downloadpatchwork-04f382b79322d981138a67693777da791b704749.tar
patchwork-04f382b79322d981138a67693777da791b704749.tar.gz
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 <stephen@that.guru>
-rw-r--r--patchwork/tests/api/test_person.py2
-rw-r--r--patchwork/tests/utils.py11
2 files changed, 10 insertions, 3 deletions
diff --git a/patchwork/tests/api/test_person.py b/patchwork/tests/api/test_person.py
index 6bd3cb6..2139574 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 5ebc933..4ac9afe 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)