Changeset 7009 for main/waeup.sirp/trunk/src/waeup/sirp/students/tests

Timestamp:

6 Nov 2011, 17:24:21 (13 years ago)

Author:

Henrik Bettermann

Message:

Filter actions if students are using the AccommodationManageFormPage?.

I first tried to use two different pages, one for officers and one for students, and use different targets in breadcrumbs. But this was much more complicated.

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

@@ -497 +497 @@
         self.assertTrue('Processing of 1 rows failed' in self.browser.contents)
         self.assertTrue('Successfully processed 2 rows' in self.browser.contents)
+        return
 
     def test_student_change_password(self):
@@ -741 +742 @@
         self.assertMatches('...Clearance process has been started...',
                            self.browser.contents)
-
+        return
 
     def test_student_payments(self):
@@ -834 +835 @@
                            self.browser.contents)
         self.assertTrue(self.student.state,'school fee paid')
+        return
 
     def test_manage_accommodation(self):
@@ -856 +858 @@
         # Managers can use HOS code and book a bed space with it
         self.browser.open(self.acco_student_path)
-        self.browser.getControl("Add bed ticket").click()
+        self.browser.getControl("Book accommodation").click()
         self.assertMatches('...Wrong state...',
                            self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('admit')
-        self.browser.getControl("Add bed ticket").click()
+        self.browser.getControl("Book accommodation").click()
         self.assertMatches('...Activation Code:...',
                            self.browser.contents)
@@ -872 +874 @@
         self.assertTrue(bed.owner,self.student_id)
         # BedTicketAddPage is now blocked
-        self.browser.getControl("Add bed ticket").click()
+        self.browser.getControl("Book accommodation").click()
         self.assertMatches('...Ticket for 2004 already created...',
             self.browser.contents)
@@ -889 +891 @@
         self.browser.getControl("Remove selected", index=0).click()
         self.assertMatches('...Successfully removed...', self.browser.contents)
-        # Due to an event handler also the bed has been released properly
+        # 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)
+        return
 
     def test_student_accommodation(self):
-        pass
+        return