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

Timestamp:

12 Jan 2012, 16:19:57 (13 years ago)

Author:

Henrik Bettermann

Message:

Merge Bootstrap branch into trunk.

File:

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

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

@@ -807 +807 @@
         self.browser.getLink("Clear student").click()
         self.assertTrue('Student has been cleared' in self.browser.contents)
-        self.assertTrue('State: <span>cleared</span>' in self.browser.contents)
+        self.assertTrue('cleared' in self.browser.contents)
         self.browser.getLink("Reject clearance").click()
         self.assertTrue('Clearance has been annulled' in self.browser.contents)
@@ -814 +814 @@
         self.assertEqual(self.browser.url, self.student_path +
             '/contactstudent?subject=%s' % urlmessage)
-        self.assertTrue('State: <span>clearance started</span>'
-            in self.browser.contents)
+        self.assertTrue('clearance started' in self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('request_clearance')
         self.browser.open(self.clearance_student_path)
@@ -821 +820 @@
         self.assertTrue('Clearance request has been rejected'
             in self.browser.contents)
-        self.assertTrue('State: <span>clearance started</span>'
-            in self.browser.contents)
+        self.assertTrue('clearance started' in self.browser.contents)
         # CO does now also see the contact form and can send a message
         self.browser.getControl(name="form.subject").value = 'Important subject'
@@ -917 +915 @@
         self.browser.getLink("Validate courses").click()
         self.assertTrue('Course list has been validated' in self.browser.contents)
-        self.assertTrue('State: <span>courses validated</span>' in self.browser.contents)
+        self.assertTrue('courses validated' in self.browser.contents)
         self.browser.getLink("Reject courses").click()
         self.assertTrue('Course list request has been annulled'
@@ -924 +922 @@
         self.assertEqual(self.browser.url, self.student_path +
             '/contactstudent?subject=%s' % urlmessage)
-        self.assertTrue('State: <span>school fee paid</span>'
-            in self.browser.contents)
+        self.assertTrue('school fee paid' in self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('register_courses')
         self.browser.open(L110_student_path)
@@ -931 +928 @@
         self.assertTrue('Course list request has been rejected'
             in self.browser.contents)
-        self.assertTrue('State: <span>school fee paid</span>'
-            in self.browser.contents)
+        self.assertTrue('school fee paid' in self.browser.contents)
         # CA does now see the contact form and can send a message
         self.browser.getControl(name="form.subject").value = 'Important subject'
@@ -977 +973 @@
         self.assertTrue('Password changed' in self.browser.contents)
         # We are still logged in. Changing the password hasn't thrown us out.
-        self.browser.getLink("My Data").click()
+        self.browser.getLink("Base Data").click()
         self.assertEqual(self.browser.url, self.student_path)
         # We can logout