Changeset 6800

Timestamp:

19 Sep 2011, 14:10:10 (13 years ago)

Author:

Henrik Bettermann

Message:

Improve test coverage.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -175 +175 @@
             return
         elif student_pw:
-            self.flash('Password has already been set.')
+            self.flash('Password has already been set. You are using the wrong Access Code.')
             return
         # Mark pin as used (this also fires a pin related transition)

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

@@ -311 +311 @@
         self.browser.getControl(name="form.current_level").value = ['100']
         self.browser.getControl("Save").click()
-        # Managers can add a any study level (course list)
+        # Managers can add and remove any study level (course list)
         self.browser.getControl(name="addlevel").value = ['100']
         self.browser.getControl("Add study level").click()
         self.assertMatches('...<span>100</span>...', self.browser.contents)
+        self.browser.getControl(name="val_id").value = ['100']
+        self.browser.getControl("Remove selected").click()
+        self.assertMatches('...Successfully removed...', self.browser.contents)
+        # Add again level again
+        self.browser.getControl(name="addlevel").value = ['100']
+        self.browser.getControl("Add study level").click()
+
         # Managers can view and manage course lists
         self.browser.getLink("100").click()
@@ -419 +426 @@
         self.browser.getControl(name="ac_series").value = self.existing_pwdseries
         self.browser.getControl(name="ac_number").value = self.existing_pwdnumber
+        self.browser.getControl(name="reg_number").value = '223456'
+        self.browser.getControl("Show").click()
+        self.assertMatches('...No student found...',
+                           self.browser.contents)
+        self.browser.getControl(name="reg_number").value = '123456'
+        self.browser.getControl(name="ac_number").value = '999999'
+        self.browser.getControl("Show").click()
+        self.assertMatches('...Access code is invalid...',
+                           self.browser.contents)
+        self.browser.getControl(name="ac_number").value = self.existing_pwdnumber
+        self.browser.getControl("Show").click()
+        self.assertMatches('...Password has been set. Your Student Id is...',
+                           self.browser.contents)
+        self.browser.getControl("Show").click()
+        self.assertMatches(
+            '...Password has already been set. Your Student Id is...',
+            self.browser.contents)
+        existing_pwdpin = self.pwdpins[1]
+        parts = existing_pwdpin.split('-')[1:]
+        existing_pwdseries, existing_pwdnumber = parts
+        self.browser.getControl(name="ac_series").value = existing_pwdseries
+        self.browser.getControl(name="ac_number").value = existing_pwdnumber
         self.browser.getControl(name="reg_number").value = '123456'
         self.browser.getControl("Show").click()
-        self.assertMatches('...Password has been set. Your Student Id is...',
-                           self.browser.contents)
+        self.assertMatches(
+            '...You are using the wrong Access Code...',
+            self.browser.contents)
         # The student can login with the new credentials
         self.browser.open(self.login_path)