From 547ee19d09213d2f901a4c1178da5ae0fd5567cd Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 2 Feb 2018 10:17:52 +0100 Subject: [PATCH] Fixed some stages tests --- stages/tests.py | 6 +++--- stages/views.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stages/tests.py b/stages/tests.py index cd765c6..b0ff7d5 100644 --- a/stages/tests.py +++ b/stages/tests.py @@ -108,13 +108,13 @@ class StagesTest(TestCase): def test_new_training(self): student = Student.objects.get(last_name='Varrin') - avail = Availability.objects.get(pk=2) + avail = Availability.objects.filter(priority=True).first() response = self.client.post(reverse('new_training'), {'student': student.pk, 'avail': avail.pk, - 'referent': 1}) + 'referent': Teacher.objects.first().pk}) self.assertEqual(response.content, b'OK') - avail = Availability.objects.get(pk=2) + avail.refresh_from_db() self.assertEqual(avail.training.student, student) def test_archived_trainings(self): diff --git a/stages/views.py b/stages/views.py index 2d97558..ff4bb66 100644 --- a/stages/views.py +++ b/stages/views.py @@ -565,7 +565,7 @@ class ImportBulletinView(FormView): email_sent = 0 pdf_file_list = os.listdir(temp_dir) - students = klass.student_set.exclude(archived=True) + students = klass.student_set.exclude(archived=True).order_by('last_name', 'first_name') for student in students: if not student.email: messages.warning(self.request, "L'étudiant %s ne possède pas d'email." % student)