Changeset 14238 for main/waeup.aaue/trunk/src/waeup

Timestamp:

28 Oct 2016, 08:24:50 (8 years ago)

Author:

Henrik Bettermann

Message:

Fix checkAccommodationRequirements.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• tests/test_browser.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -32 +32 @@
 from zope.catalog.interfaces import ICatalog
 from waeup.kofa.app import University
-from waeup.kofa.interfaces import VALIDATED
+from waeup.kofa.interfaces import VALIDATED, PAID
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
 from waeup.kofa.students.accommodation import BedTicket
@@ -796 +796 @@
             in self.browser.contents)
         self.student['studycourse'].certificate.study_mode = 'ug_ft'
+        self.app['hostels'].accommodation_states = [PAID]
+        self.browser.getControl("Book accommodation").click()
+        self.assertTrue(
+            'You are in the wrong registration state.'
+            in self.browser.contents)
+        IWorkflowState(self.student).setState(PAID)
         self.browser.getControl("Book accommodation").click()
         self.assertFalse('Activation Code:' in self.browser.contents)

main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

@@ -391 +391 @@
 
     def checkAccommodationRequirements(self, student, acc_details):
-        super(CustomStudentsUtils, self).checkAccommodationRequirements(
+        msg = super(CustomStudentsUtils, self).checkAccommodationRequirements(
             student, acc_details)
+        if msg:
+            return msg
         if student.current_mode not in ('ug_ft', 'de_ft', 'mug_ft', 'mde_ft'):
             return _('You are not eligible to book accommodation.')