From 06765d74dc933f82effe5c96844f07e1ee550725 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Tue, 20 Mar 2018 10:31:47 +0000
Subject: [PATCH] fixup! Add a default ordering to the users
---
opentech/apply/funds/tests/test_models.py | 5 +++--
opentech/apply/users/models.py | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opentech/apply/funds/tests/test_models.py b/opentech/apply/funds/tests/test_models.py
index a463b9264..107d0f352 100644
--- a/opentech/apply/funds/tests/test_models.py
+++ b/opentech/apply/funds/tests/test_models.py
@@ -251,14 +251,15 @@ class TestFormSubmission(TestCase):
self.assertEqual(ApplicationSubmission.objects.first().user, user)
def test_associated_if_another_user_exists(self):
+ email = 'another@email.com'
self.submit_form()
# Someone else submits a form
- self.submit_form(email='another@email.com')
+ self.submit_form(email=email)
# Lead + 2 x applicant
self.assertEqual(self.User.objects.count(), 3)
- _, first_user, second_user = self.User.objects.all()
+ first_user, second_user = self.User.objects.get(email=self.email), self.User.objects.get(email=email)
self.assertEqual(ApplicationSubmission.objects.count(), 2)
self.assertEqual(ApplicationSubmission.objects.first().user, first_user)
self.assertEqual(ApplicationSubmission.objects.last().user, second_user)
diff --git a/opentech/apply/users/models.py b/opentech/apply/users/models.py
index 7b729c39b..4441064d4 100644
--- a/opentech/apply/users/models.py
+++ b/opentech/apply/users/models.py
@@ -85,3 +85,6 @@ class User(AbstractUser):
class Meta:
ordering = ('full_name', 'email')
+
+ def __repr__(self):
+ return f'<{self.__class__.__name__}: {self.full_name} ({self.email})>'
--
GitLab