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

Timestamp:

31 Oct 2012, 16:01:42 (12 years ago)

Author:

Henrik Bettermann

Message:

Add clearance_comment attribute. When CO rejects clearance she is requested to enter a comment. This comment is stored with the student object and logged. The contact form is pre-filled with the comment. When a student is cleared the comment will be automatically removed.

Location:

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

Files:

• test_browser.py (modified) (3 diffs)
• test_export.py (modified) (3 diffs)

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

@@ -1209 +1209 @@
         self.browser.open(self.clearance_path)
         self.browser.getLink("Reject clearance").click()
+        self.assertEqual(
+            self.browser.url, self.student_path + '/reject_clearance')
+        # Type comment why
+        self.browser.getControl(name="form.clearance_comment").value = """Dear Student,
+You did not fill properly.
+"""
+        self.browser.getControl("Save comment").click()
         self.assertTrue('Clearance has been annulled' in self.browser.contents)
-        urlmessage = 'Clearance+has+been+annulled.'
-        # CO does now see the contact form
-        self.assertEqual(self.browser.url, self.student_path +
-            '/contactstudent?subject=%s' % urlmessage)
+        url = ('http://localhost/app/students/K1000000/'
+              'contactstudent?body=Dear+Student%2C%0AYou+did+not+fill+properly.'
+              '%0A&subject=Clearance+has+been+annulled.')
+        # CO does now see the prefilled contact form and can send a message
+        self.assertEqual(self.browser.url, url)
         self.assertTrue('clearance started' in self.browser.contents)
+        self.assertTrue('name="form.subject" size="20" type="text" '
+            'value="Clearance has been annulled."'
+            in self.browser.contents)
+        self.assertTrue('name="form.body" rows="10" >Dear Student,'
+            in self.browser.contents)
+        self.browser.getControl("Send message now").click()
+        self.assertTrue('Your message has been sent' in self.browser.contents)
+        # The comment has been stored ...
+        self.assertEqual(self.student.clearance_comment,
+            u'Dear Student,\nYou did not fill properly.\n')
+        # ... and logged
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'students.log')
+        logcontent = open(logfile).read()
+        self.assertTrue(
+            'INFO - mrclear - students.browser.StudentRejectClearancePage - '
+            'K1000000 - comment: Dear Student,<br>You did not fill '
+            'properly.<br>\n' in logcontent)
         self.browser.open(self.history_path)
         self.assertTrue("Reset to 'clearance started' by My Public Name" in
@@ -1221 +1247 @@
         self.browser.open(self.clearance_path)
         self.browser.getLink("Reject clearance").click()
+        self.browser.getControl("Save comment").click()
         self.assertTrue('Clearance request has been rejected'
             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'
-        self.browser.getControl(name="form.body").value = 'Clearance rejected'
-        self.browser.getControl("Send message now").click()
-        self.assertTrue('Your message has been sent' in self.browser.contents)
         # The CO can't clear students if not in state
         # clearance requested
@@ -1240 +1262 @@
         self.browser.getLink("Show students").click()
         self.assertTrue(self.student_id in self.browser.contents)
+
+
+        # When a student is cleared the comment is automatically deleted
+        IWorkflowInfo(self.student).fireTransition('request_clearance')
+        IWorkflowInfo(self.student).fireTransition('clear')
+        self.assertEqual(self.student.clearance_comment, None)
+
 
     def test_handle_courses_by_ca(self):

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

@@ -43 +43 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'adm_code,clearance_comment,clearance_locked,clr_code,'
+            'date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
             'perm_address,phone,reg_number,sex,student_id,suspended,password,'
             'state,history,certcode,is_postgrad,current_level,current_session\r\n'
 
-            'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
+            'my adm code,,0,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,"Studentroad 21\nLagos 123456\n",'
             '+234-123-12345#,123,f,A111111,0,,created'
@@ -63 +64 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'adm_code,clearance_comment,clearance_locked,clr_code,'
+            'date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
             'perm_address,phone,reg_number,sex,student_id,suspended,password,'
             'state,history,certcode,is_postgrad,current_level,current_session\r\n'
 
-            'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
+            'my adm code,,0,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,"Studentroad 21\nLagos 123456\n",'
             '+234-123-12345#,123,f,A111111,0,,created'
@@ -82 +84 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'adm_code,clearance_comment,clearance_locked,clr_code,'
+            'date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
             'perm_address,phone,reg_number,sex,student_id,suspended,password,'
             'state,history,certcode,is_postgrad,current_level,current_session\r\n'
 
-            'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
+            'my adm code,,0,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,"Studentroad 21\nLagos 123456\n",'
             '+234-123-12345#,123,f,A111111,0,,created'