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

Timestamp:

31 Oct 2012, 16:30:02 (12 years ago)

Author:

Henrik Bettermann

Message:

Rename clearance_comment to officer_comment. That's more appropriate since the comment can also be used by other officers.

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

@@ -1212 +1212 @@
             self.browser.url, self.student_path + '/reject_clearance')
         # Type comment why
-        self.browser.getControl(name="form.clearance_comment").value = """Dear Student,
+        self.browser.getControl(name="form.officer_comment").value = """Dear Student,
 You did not fill properly.
 """
@@ -1231 +1231 @@
         self.assertTrue('Your message has been sent' in self.browser.contents)
         # The comment has been stored ...
-        self.assertEqual(self.student.clearance_comment,
+        self.assertEqual(self.student.officer_comment,
             u'Dear Student,\nYou did not fill properly.\n')
         # ... and logged
@@ -1267 +1267 @@
         IWorkflowInfo(self.student).fireTransition('request_clearance')
         IWorkflowInfo(self.student).fireTransition('clear')
-        self.assertEqual(self.student.clearance_comment, None)
+        self.assertEqual(self.student.officer_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_comment,clearance_locked,clr_code,'
-            'date_of_birth,email,employer,'
-            'firstname,lastname,matric_number,middlename,nationality,'
+            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'firstname,lastname,matric_number,middlename,nationality,officer_comment,'
             '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,,'
-            'Anna,Tester,234,M.,NG,"Studentroad 21\nLagos 123456\n",'
+            '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'
             in result
@@ -64 +63 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_comment,clearance_locked,clr_code,'
-            'date_of_birth,email,employer,'
-            'firstname,lastname,matric_number,middlename,nationality,'
+            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'firstname,lastname,matric_number,middlename,nationality,officer_comment,'
             '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,,'
-            'Anna,Tester,234,M.,NG,"Studentroad 21\nLagos 123456\n",'
+            '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'
             in result
@@ -84 +82 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_comment,clearance_locked,clr_code,'
-            'date_of_birth,email,employer,'
-            'firstname,lastname,matric_number,middlename,nationality,'
+            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'firstname,lastname,matric_number,middlename,nationality,officer_comment,'
             '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,,'
-            'Anna,Tester,234,M.,NG,"Studentroad 21\nLagos 123456\n",'
+            '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'
             in result