Changeset 11622 for main/waeup.aaue/trunk/src/waeup/aaue/students/tests

Timestamp:

6 May 2014, 06:20:46 (11 years ago)

Author:

Henrik Bettermann

Message:

• Do not create activation code when paying acceptance (= clearance) fee payment tickets.

• Cleared students must pay acceptance fee before paying school fees.

Location:

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

Files:

• test_browser.py (modified) (1 diff)
• test_utils.py (modified) (1 diff)

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

@@ -136 +136 @@
         self.app['configuration']['2004'].school_fee = 6666.0
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
-        self.browser.getControl("Create ticket").click()
-        self.assertMatches('...ticket created...',
-                           self.browser.contents)
+        # Accepotance fee must be paid first
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Please pay acceptance fee first...',
+                           self.browser.contents)
+        self.app['configuration']['2004'].clearance_fee = 666.0
+        self.browser.getControl(name="form.p_category").value = ['clearance']
+        self.browser.getControl("Create ticket").click()
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
+        self.student['payments'][value].approveStudentPayment()
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[1]
         self.browser.getLink(value).click()
         self.assertMatches('...Amount Authorized...',
                            self.browser.contents)
-        # Managers can open payment slip
+        # Managers can open school fee payment slip
         self.browser.getLink("Download payment slip").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
         # Set ticket paid
-        ticket = self.student['payments'].items()[0][1]
-        ticket.p_state = 'paid'
+        ticket = self.student['payments'][value].approveStudentPayment()
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...This type of payment has already been made...',
-                           self.browser.contents)
-        self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['clearance']
-        self.browser.getControl("Create ticket").click()
-        self.assertMatches('...ticket created...',
                            self.browser.contents)
 

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

@@ -56 +56 @@
 
         IWorkflowState(self.student).setState('cleared')
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        # Acceptance fee must be paid first.
+        self.assertEqual(error, 'Please pay acceptance fee first.')
+        payment = createObject('waeup.StudentOnlinePayment')
+        payment.p_category = 'clearance'
+        self.student['payments']['any_id'] = payment
+        payment.approveStudentPayment()
+        # No activation code created.
+        self.assertEqual(payment.ac, None)
+        # School fee can be set.
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.p_level, 100)