Changeset 8624 for main

Timestamp:

4 Jun 2012, 10:28:28 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix test.

Replace default value of verdicts.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

• applicants/tests.py (modified) (7 diffs)
• students/utils.py (modified) (1 diff)

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/tests.py

@@ -65 +65 @@
         self.pgcontainer.code = u'pgft2011'
         self.pgcontainer.prefix = u'pgft'
+        self.pgcontainer.application_category = u'pg_ft'
         self.pgcontainer.year = 2011
         self.pgcontainer.application_fee = 300.0
@@ -72 +73 @@
         self.ugcontainer.code = u'putme2011'
         self.ugcontainer.prefix = u'putme'
+        self.ugcontainer.application_category = u'basic'
         self.ugcontainer.year = 2011
         self.ugcontainer.application_fee = 200.0
@@ -87 +89 @@
         self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
             self.certificate)
+        self.certificate2 = createObject('waeup.Certificate')
+        self.certificate2.code = 'CERT2'
+        self.certificate2.application_category = 'pg_ft'
+        self.certificate2.start_level = 100
+        self.certificate2.end_level = 500
+        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
+            self.certificate2)
 
         # Add (customized) applicants
@@ -122 +131 @@
         self.browser.getControl(name="form.firstname").value = 'John'
         self.browser.getControl(name="form.lastname").value = 'Tester'
-        self.browser.getControl(name="form.course1").value = ['CERT1']
         self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
         self.browser.getControl(name="form.lga").value = ['foreigner']
@@ -152 +160 @@
         # We can save the applicant
         self.fill_correct_values()
+        self.browser.getControl(name="form.course1").value = ['CERT1']
         self.browser.getControl("Save").click()
         self.assertMatches('...Form has been saved...', self.browser.contents)
@@ -170 +179 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.fill_correct_values()
+        self.browser.getControl(name="form.course1").value = ['CERT1']
         self.browser.getControl("Save").click()
         self.assertMatches('...Form has been saved...', self.browser.contents)
-        self.fill_correct_values()
         self.browser.getControl("Save").click()
         self.browser.getControl("Add online payment ticket").click()
@@ -191 +200 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.fill_correct_values()
+        self.browser.getControl(name="form.course1").value = ['CERT2']
         self.browser.getControl(name="form.reg_number").value = '2345'
         self.browser.getControl(name="form.firstname").value = 'Anna'

main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py

@@ -125 +125 @@
 
     VERDICTS_DICT = {
-        '0': 'not yet',
+        'NY': 'not yet',
         'A': 'Successful student',
         'B': 'Student with carryover courses',