Changeset 13346 for main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py

Timestamp:

26 Oct 2015, 08:57:30 (9 years ago)

Author:

Henrik Bettermann

Message:

Remove beds_reserved attribute from hostels. Hostels do no longer
contain information about reserved bed spaces.

Use default values for list attributes. Otherwise the hostel manage page cannot be opened after import of hostels.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py (modified) (6 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py

@@ -311 +311 @@
         self.assertEqual(self.app['hostels']['hall-1'][
             'hall-1_A_101_D'].bed_type, 'regular_female_reserved')
-        self.assertTrue('A_101_A  ' in self.browser.contents)
         # The catalog has been updated.
         results = cat.searchResults(
@@ -340 +339 @@
             bed_type=('regular_female_all', 'regular_female_all'))
         results = [(x.bed_id, x.bed_type) for x in results]
+        # The reservation of hall-1_A_101_D has been cancelled.
         self.assertEqual(results,
-            [(u'hall-1_B_101_D', u'regular_female_all'),])
-        # Unreserve beds.
-        ctrl = self.browser.getControl(name='val_id')
-        ctrl.getControl(value='hall-1_A_101_A').selected = True
-        ctrl.getControl(value='hall-1_A_101_B').selected = True
-        ctrl.getControl(value='hall-1_A_101_C').selected = True
-        ctrl.getControl(value='hall-1_A_101_D').selected = True
-        self.browser.getControl("Switch reservation", index=0).click()
-        assert self.app['hostels']['hall-1'][
-            'hall-1_A_101_D'].bed_type == 'regular_female_all'
-        self.assertFalse(expected in self.browser.contents)
+            [(u'hall-1_A_101_D', u'regular_female_all'),
+             (u'hall-1_B_101_D', u'regular_female_all')])
         # Release bed which has previously been booked.
         bedticket = BedTicket()
@@ -508 +499 @@
             result,
             'beds_for_all,beds_for_final,beds_for_fresh,beds_for_pre,'
-            'beds_for_returning,beds_reserved,blocks_for_female,'
+            'beds_for_returning,blocks_for_female,'
             'blocks_for_male,floors_per_block,hostel_id,hostel_name,maint_fee,'
-            'rooms_per_floor,sort_id,special_handling\r\n,,,,,[],,,1,'
-            'hall-x,Hall 1,0.0,2,10,regular\r\n'
+            'rooms_per_floor,sort_id,special_handling\r\n[],[],[],[],[],[],[],'
+            '1,hall-x,Hall 1,0.0,2,10,regular\r\n'
             )
         return
@@ -554 +545 @@
             "updated: "
             "beds_for_pre=['G'], floors_per_block=1, "
+            "special_handling=regular, "
             "beds_for_final=['A', 'B'], rooms_per_floor=32, "
             "hostel_id=block-a-upper-hostel, "
@@ -562 +554 @@
         shutil.rmtree(os.path.dirname(fin_file))
         shutil.rmtree(self.workdir)
+        # The manage page can be opened.
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.container_path + '/block-a-upper-hostel')
+        self.browser.getLink("Manage").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
         return
 
@@ -582 +579 @@
             "updated: "
             "beds_for_pre=['G'], floors_per_block=1, "
+            "special_handling=regular, "
             "beds_for_final=['A', 'B'], rooms_per_floor=32, "
             "hostel_id=block-a-upper-hostel, "