Changeset 11254 for main/waeup.kofa/trunk/src/waeup/kofa/students/tests

Timestamp:

22 Feb 2014, 15:46:03 (11 years ago)

Author:

uli

Message:

Merge changes from uli-diazo-themed back into trunk. If this works, then a miracle happened.

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/students/tests/test_browser.py (modified) (8 diffs)

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

@@ -613 +613 @@
         # There is a correct <img> link included
         self.assertTrue(
-            '<a target="image" href="birth_certificate">'
+            'href="http://localhost/app/students/K1000000/birth_certificate"'
             in self.browser.contents)
         # Browsing the link shows a real image
@@ -673 +673 @@
             name='upload_passportuploadmanage').click()
         self.assertTrue(
-            '<img align="middle" height="125px" src="passport.jpg" />'
+            'src="http://localhost/app/students/K1000000/passport.jpg"'
             in self.browser.contents)
         # We remove the passport file again
@@ -1958 +1958 @@
         # We are logged in as student and can see the 'My Data' tab
         self.assertMatches(
-            '...<a href="#" class="dropdown-toggle">My Data</a>...',
+            '...<a href="#" class="dropdown-toggle" data-toggle="dropdown">...',
+            self.browser.contents)
+        self.assertMatches(
+            '...My Data...',
             self.browser.contents)
         self.browser.getLink("Logout").click()
@@ -2198 +2201 @@
         self.browser.getControl("Login").click()
         self.assertMatches(
-            '...<div class="alert-message warning">'
+            '...<div class="alert alert-warning">'
             'Your account has been deactivated.</div>...', self.browser.contents)
         # If suspended_comment is set this message will be flashed instead
@@ -2206 +2209 @@
         self.browser.getControl("Login").click()
         self.assertMatches(
-            '...<div class="alert-message warning">Aetsch baetsch!</div>...',
+            '...<div class="alert alert-warning">Aetsch baetsch!</div>...',
             self.browser.contents)
         self.student.suspended = False
@@ -2265 +2268 @@
             name='upload_passportuploadedit').click()
         self.assertTrue(
-            '<img align="middle" height="125px" src="passport.jpg" />'
+            'src="http://localhost/app/students/K1000000/passport.jpg"'
             in self.browser.contents)
         # Students can open admission letter
@@ -2323 +2326 @@
             name='upload_birthcertificateupload').click()
         self.assertTrue(
-            '<a target="image" href="birth_certificate">Birth Certificate Scan</a>'
+            'href="http://localhost/app/students/K1000000/birth_certificate"'
             in self.browser.contents)
         # Students can open clearance slip
@@ -2358 +2361 @@
         # Now students can add the current study level
         self.browser.getLink("Study Course").click()
+        self.student['studycourse'].current_level = None
+        self.browser.getLink("Add course list").click()
+        self.assertMatches('...Your data are incomplete...',
+                           self.browser.contents)
+        self.student['studycourse'].current_level = 100
         self.browser.getLink("Add course list").click()
         self.assertMatches('...Add current level 100 (Year 1)...',