Merge pull request #449 from uclouvain/dev

[QA] Release 6.2

business/assignment.py

@@ -410,7 +410,10 @@ def _assign_regular_students(assignment, internship):
 def _assign_student(assignment, student, internship):
     assignment.count += 1
     """ Assign offer to student for specific internship."""
-    choices = assignment.choices.filter(student=student, internship=internship).order_by("choice")
+    if isinstance(internship, Iterable):
+        choices = assignment.choices.filter(student=student, internship__in=internship).order_by("choice")
+    else:
+        choices = assignment.choices.filter(student=student, internship=internship).order_by("choice")
 
     affectations = None
 

requirements.txt

@@ -1 +1 @@
-pendulum==2.1.2
+pendulum==3.0.0

tests/views/test_common.py

@@ -46,12 +46,12 @@ def setUp(self):
     def test_get_object_list_with_default_paginator_size(self):
         objects = [{} for _ in range(0, OBJECTS_LIST_SIZE)]
         request = RequestFactory().get('/')
-        SessionMiddleware().process_request(request)
+        SessionMiddleware(lambda: None).process_request(request)
         self.assertEqual(len(get_object_list(request, objects)), PAGINATOR_SIZE_LIST[0])
 
     def test_get_object_list_with_paginator_size_query_param(self):
         objects = [{} for _ in range(0, OBJECTS_LIST_SIZE)]
         request = RequestFactory().get('/?paginator_size={}'.format(TEST_PAGINATOR_SIZE))
-        SessionMiddleware().process_request(request)
+        SessionMiddleware(lambda: None).process_request(request)
         self.assertEqual(len(get_object_list(request, objects)), TEST_PAGINATOR_SIZE)
         self.assertEqual(request.session['paginator_size'], {request.path: str(TEST_PAGINATOR_SIZE)})