Changeset 13460 for main/waeup.uniben/trunk/src/waeup/uniben/students

Timestamp:

16 Nov 2015, 09:10:31 (9 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

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

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

@@ -944 +944 @@
         # ... but not if booking period has expired ...
         self.app['hostels'].enddate = datetime.now(pytz.utc)
-        self.browser.getLink("Book accommodation").click()
+        self.browser.getControl("Book accommodation").click()
         self.assertMatches('...Outside booking period: ...',
                            self.browser.contents)
@@ -950 +950 @@
         # ... or student data are incomplete ...
         self.student['studycourse'].current_level = None
-        self.browser.getLink("Book accommodation").click()
+        self.browser.getControl("Book accommodation").click()
         self.assertMatches('...Your data are incomplete...',
             self.browser.contents)
         self.student['studycourse'].current_level = 200
         # ... or student is not the an allowed state ...
-        self.browser.getLink("Book accommodation").click()
+        self.browser.getControl("Book accommodation").click()
         self.assertMatches('...You are in the wrong...',
                            self.browser.contents)
@@ -964 +964 @@
         self.student['studycourse'].current_level = 500 # final-year
         self.student['studycourse'].current_verdict = 'C'
-        self.browser.getLink("Book accommodation").click()
+        self.browser.getControl("Book accommodation").click()
         self.assertMatches('...Your are not eligible...',
             self.browser.contents)
         self.student['studycourse'].previous_verdict = 'A'
-        self.browser.getLink("Book accommodation").click()
+        self.browser.getControl("Book accommodation").click()
         self.assertMatches('...Activation Code:...',
                            self.browser.contents)
@@ -996 +996 @@
         self.assertTrue(bed.owner == self.student_id)
         # BedTicketAddPage is now blocked.
-        self.browser.getLink("Book accommodation").click()
+        self.browser.getControl("Book accommodation").click()
         self.assertMatches('...You already booked a bed space...',
             self.browser.contents)

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

@@ -388 +388 @@
         return None
 
-    def selectBed(self, available_beds):
-        """Select a bed from a list of available beds.
-        Beds are sorted by the sort id of the hostel and the bed number.
-        The first bed found in this sorted list is taken.
-        """
-        sorted_beds = sorted(available_beds,
-            key=lambda bed: 1000 * bed.__parent__.sort_id + bed.bed_number)
-        return sorted_beds[0]
-
     # Uniben prefix
     STUDENT_ID_PREFIX = u'B'