Changeset 15594

Timestamp:

19 Sep 2019, 13:30:53 (5 years ago)

Author:

Henrik Bettermann

Message:

Update tests. Remove GATEWAY_AMT again. See ticket #262.

Location:

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

Files:

• applicants/interfaces.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (8 diffs)
• students/tests/test_utils.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)

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

@@ -69 +69 @@
 
     def getTitle(self, value):
+        if not SCHOOLS.get(value, None):
+            return u"none-existent"
         return u"%s: %s -- %s" % (
             SCHOOLS[value][0],

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

@@ -229 +229 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 70457.5)
+        self.assertEqual(payment.amount_auth, 70000)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
@@ -242 +242 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 35457.5)
+        self.assertEqual(payment.amount_auth, 35300)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
@@ -249 +249 @@
         self.certificate.study_mode = 'ug_ft'
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(payment.amount_auth,  56307.5)
+        self.assertEqual(payment.amount_auth,  56150)
         self.assertEqual(error, None)
         # UG cleared students pay 65650
         IWorkflowState(self.student).setState('cleared')
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(payment.amount_auth, 65807.5)
+        self.assertEqual(payment.amount_auth, 65650)
         self.assertEqual(error, None)
 
@@ -272 +272 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 277.5)
+        self.assertEqual(payment.amount_auth, 120)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
@@ -285 +285 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 1033.5)
+        self.assertEqual(payment.amount_auth, 876)
         self.assertEqual(payment.p_item, u'My bed coordinates')
         self.assertEqual(error, None)
@@ -292 +292 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 8095.5)
+        self.assertEqual(payment.amount_auth, 7938)
         self.assertEqual(payment.p_item, u'')
         self.assertEqual(error, None)
@@ -300 +300 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 705.0)  # 62.5% * 876 + 157.5
+        self.assertEqual(payment.amount_auth, 547.5)  # 62.5% * 876
         self.assertEqual(payment.p_item, u'My bed coordinates')
         self.assertEqual(error, None)
@@ -307 +307 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 307.5)
+        self.assertEqual(payment.amount_auth, 150)
         self.assertEqual(payment.p_item, u'')
         self.assertEqual(error, None)

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

@@ -84 +84 @@
         IWorkflowState(self.student).setState('returning')
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(payment.amount_auth, 16131.5) # 15875 + 157.5 + 99
+        self.assertEqual(payment.amount_auth, 15974) # 15875 + 99
         self.student['studycourse'].previous_verdict = 'O'
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(payment.amount_auth, 16032.5) # 15875 + 157.5
+        self.assertEqual(payment.amount_auth, 15875)
         return

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

@@ -38 +38 @@
         'NFRE','NARB','NHAU','NIGB','NYOR','NSOS')
 
-GATEWAY_AMT = 157.50
+GATEWAY_AMT = 0.0
 
 class CustomStudentsUtils(NigeriaStudentsUtils):