Changeset 9998 for main/waeup.fceokene/trunk

Timestamp:

24 Feb 2013, 18:36:29 (12 years ago)

Author:

Henrik Bettermann

Message:

Add and adjust tests.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

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

main/waeup.fceokene/trunk/src/waeup/fceokene/interswitch/tests.py

@@ -105 +105 @@
             in self.browser.contents)
 
-        # Let's do the same for maintenance fee payment
+        # Maintenance fee payment
 
         self.browser.open(self.payments_path)
@@ -122 +122 @@
         # Bed is randomly selected but, since there is only
         # one bed for this student, we know that ...
-        self.assertMatches('...Hall 1, Block A, Room 101, Bed A...',
-                           self.browser.contents)
-        self.assertMatches('...ticket created...',
-                           self.browser.contents)
+        self.assertFalse('Hall 1, Block A, Room 101, Bed A'
+                           in self.browser.contents)
+        self.assertTrue('(see payment slip)'
+                           in self.browser.contents)
+        self.assertTrue('ticket created'
+                           in self.browser.contents)
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(
@@ -139 +141 @@
         self.assertTrue(
             '<span>4150.0</span>' in self.browser.contents)
+        # p_item is not unveiled
+        self.assertFalse('Hall 1, Block A, Room 101, Bed A'
+            in self.browser.contents)
+        self.assertTrue('(visible after successful payment)'
+            in self.browser.contents)
         self.payment_url = self.browser.url
         self.assertEqual(self.student['payments'][value].provider_amt, 0.0)
@@ -161 +168 @@
         # BT does nor charge a fee for maintenance fee
         self.assertFalse("BT Education" in self.browser.contents)
-
-        # Let's do the same for acceptance fee
+        # p_item is not unveiled
+        self.assertFalse('Hall 1, Block A, Room 101, Bed A'
+            in self.browser.contents)
+        self.assertTrue('(visible after successful payment)'
+            in self.browser.contents)
+        # If the ticket is paid coordinates are shown
+        self.student['payments'][value].p_state = 'paid'
+        self.browser.open(self.payment_url)
+        self.assertTrue('Hall 1, Block A, Room 101, Bed A'
+            in self.browser.contents)
+        self.assertFalse('(visible after successful payment)'
+            in self.browser.contents)
+
+        # Acceptance fee payment
 
         self.browser.open(self.payments_path)

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

@@ -342 +342 @@
         # Bed is randomly selected but, since there is only
         # one bed for this student, we know that
-        self.assertMatches('...Hall 1, Block A, Room 101, Bed A...',
-                           self.browser.contents)
-        return
+        self.assertEqual(self.student['accommodation']['2004'].bed_coordinates,
+            'Hall 1, Block A, Room 101, Bed A (regular_male_fr)')
+        self.assertEqual(self.student['accommodation']['2004'].display_coordinates,
+            '(see payment slip)')
+        # But the bed coordinates are hidden.
+        self.assertFalse('Hall 1, Block A, Room 101, Bed A'
+            in self.browser.contents)
+        self.assertTrue('<td>(see payment slip)</td>'
+            in self.browser.contents)
+        return