Changeset 7057 for main/waeup.sirp/trunk/src/waeup

Timestamp:

9 Nov 2011, 12:34:48 (13 years ago)

Author:

Henrik Bettermann

Message:

Managers can relocate students if the bed's bed_type has changed.

Also fix assertion. Then we see that handle_bedticket_removed event handler does not work properly.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py (modified) (6 diffs)

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

@@ -27 +27 @@
 import cStringIO
 from datetime import datetime
+import grok
+from zope.event import notify
 from zope.component import createObject
 from zope.component.hooks import setSite, clearSite
@@ -927 +929 @@
                            self.browser.contents)
         # Bed has been allocated
-        bed = self.app['hostels']['hall-1']['hall-1_A_101_A']
-        self.assertTrue(bed.owner == self.student_id)
+        bed1 = self.app['hostels']['hall-1']['hall-1_A_101_A']
+        self.assertTrue(bed1.owner == self.student_id)
         # BedTicketAddPage is now blocked
         self.browser.getLink("Book accommodation").click()
@@ -940 +942 @@
         self.assertMatches('...regular_male_fr...', self.browser.contents)
         self.assertMatches('...%s...' % pin, self.browser.contents)
-        # Managers can relocate students
+        # Managers can relocate students if the student's bed_type has changed
         self.browser.getLink("Relocate student").click()
         self.assertMatches(
@@ -948 +950 @@
         self.assertMatches(
             "...Hall 1, Block A, Room 101, Bed B...", self.browser.contents)
-        bed1 = self.app['hostels']['hall-1']['hall-1_A_101_A']
         self.assertTrue(bed1.owner == NOT_OCCUPIED)
         bed2 = self.app['hostels']['hall-1']['hall-1_A_101_B']
@@ -958 +959 @@
         payment = self.student['payments'][payment_id]
         self.assertTrue(payment.p_item == u'regular_male_fr')
+        # Managers can relocate students if the bed's bed_type has changed
+        bed1.bed_type = u'regular_female_fr'
+        bed2.bed_type = u'regular_male_reserved'
+        notify(grok.ObjectModifiedEvent(bed1))
+        notify(grok.ObjectModifiedEvent(bed2))
+        self.browser.getLink("Relocate student").click()
+        self.assertMatches(
+            "...Student relocated and new bed booked...", self.browser.contents)
+        self.assertMatches(
+            "... Hall 1, Block A, Room 101, Bed A...", self.browser.contents)
+        self.assertMatches(bed1.owner, self.student_id)
+        self.assertMatches(bed2.owner, NOT_OCCUPIED)
         # Managers can delete bed tickets
         self.browser.open(self.acco_student_path)
@@ -965 +978 @@
         self.browser.getControl("Remove selected", index=0).click()
         self.assertMatches('...Successfully removed...', self.browser.contents)
-        # The bed has been released properly by the event handler
-        bed = self.app['hostels']['hall-1']['hall-1_A_101_A']
-        self.assertTrue(bed.owner == NOT_OCCUPIED)
+        # The bed has been properly released by the event handler
+        self.assertMatches(bed1.owner, NOT_OCCUPIED)
+        self.assertMatches(bed2.owner, NOT_OCCUPIED)
         return