Changeset 13421 for main/waeup.aaue/trunk/src/waeup/aaue/students

Timestamp:

9 Nov 2015, 14:13:28 (9 years ago)

Author:

Henrik Bettermann

Message:

Little cause but big effect: these tests had to adjusted for the changes in the previous revision.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py (modified) (7 diffs)

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

@@ -116 +116 @@
         self.browser.open(self.payments_path)
         self.browser.getLink("Add current session payment ticket").click()
-        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...Wrong state...',
@@ -131 +131 @@
         #                   self.browser.contents)
         self.app['configuration']['2004'].clearance_fee = 666.0
-        self.browser.getControl(name="form.p_category").value = ['clearance']
+        self.browser.getControl(name="form.p_category").value = ['clearance_incl']
         self.browser.getControl("Create ticket").click()
         ctrl = self.browser.getControl(name='val_id')
@@ -139 +139 @@
         self.student.nationality = u'NG'
         self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
@@ -169 +169 @@
         # ... no further school fee ticket can be added.
         self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...Wrong state...',
@@ -243 +243 @@
         IWorkflowState(self.student).setState('cleared')
         self.browser.getLink("Add current session payment ticket").click()
-        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
         self.browser.getControl("Create ticket").click()
         ctrl = self.browser.getControl(name='val_id')
@@ -265 +265 @@
         self.assertTrue(
             'zope.mgr - students.browser.OnlinePaymentApproveView '
-            '- E1000000 - schoolfee payment approved'
+            '- E1000000 - schoolfee_incl payment approved'
             in logcontent)
         # ... and in payments.log
@@ -272 +272 @@
         logcontent = open(logfile).read()
         self.assertTrue(
-            '"zope.mgr",E1000000,%s,schoolfee,6666.0,AP,,,,,,\n' % value
+            '"zope.mgr",E1000000,%s,schoolfee_incl,6666.0,AP,,,,,,\n' % value
             in logcontent)
         # Student is in state school fee paid, no activation