Ignore:
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.

Location:
main/waeup.aaue/trunk/src/waeup/aaue
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py

    r13374 r13421  
    5757        self.student.nationality = u'NG'
    5858        self.browser.open(self.payments_path + '/addop')
    59         self.browser.getControl(name="form.p_category").value = ['clearance']
     59        self.browser.getControl(name="form.p_category").value = ['clearance_incl']
    6060        self.browser.getControl("Create ticket").click()
    6161        self.assertMatches('...ticket created...',
    … …  
    6565
    6666        self.browser.open(self.payments_path + '/addop')
    67         self.browser.getControl(name="form.p_category").value = ['schoolfee']
     67        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
    6868        self.browser.getControl("Create ticket").click()
    6969        self.assertMatches('...ticket created...',
    … …  
    108108            'FeeStatus=unpaid~'
    109109            'Semester=N/A~'
    110             'PaymentType=School Fee~'
     110            'PaymentType=School Fee Plus~'
    111111            'MatricNumber=E1000000~'
    112112            'Email=aa@aa.ng~'
    … …  
    164164            'FeeStatus=unpaid~'
    165165            'Semester=N/A~'
    166             'PaymentType=School Fee~'
     166            'PaymentType=School Fee Plus~'
    167167            'MatricNumber=E1000000~'
    168168            'Email=aa@aa.ng~'

  • main/waeup.aaue/trunk/src/waeup/aaue/interswitch/tests.py

    r13410 r13421  
    154154        self.student.nationality = u'NG'
    155155        self.browser.open(self.payments_path + '/addop')
    156         self.browser.getControl(name="form.p_category").value = ['schoolfee']
     156        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
    157157        self.browser.getControl("Create ticket").click()
    158158        self.assertTrue('ticket created' in
    … …  
    182182            in self.browser.contents)
    183183        self.assertTrue(
    184             'item_name="School Fee" item_amt="4750000" bank_id="117" '
     184            'item_name="School Fee Plus" item_amt="4750000" bank_id="117" '
    185185            'acct_num="1010827641"' in self.browser.contents)
    186186
    … …  
    228228        self.student.nationality = u'NG'
    229229        self.browser.open(self.payments_path + '/addop')
    230         self.browser.getControl(name="form.p_category").value = ['clearance']
     230        self.browser.getControl(name="form.p_category").value = ['clearance_incl']
    231231        self.browser.getControl("Create ticket").click()
    232232        self.assertTrue('ticket created' in self.browser.contents)
    … …  
    245245            in self.browser.contents)
    246246        self.assertTrue(
    247             'item_name="Acceptance Fee" item_amt="4280000" bank_id="117" '
     247            'item_name="Acceptance Fee Plus" item_amt="4280000" bank_id="117" '
    248248            'acct_num="1010827641"' in self.browser.contents)
    249249
    250     def test_interswitch_form_welfare_fees(self):
     250    def test_interswitch_form_concession_fees(self):
    251251        self.certificate.study_mode = 'ug_pt'
    252         self.app['configuration']['2004'].welfare_fee = 1567.0
     252        self.app['configuration']['2004'].concession_fee = 1567.0
    253253        # Manager can access InterswitchForm
    254254        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    … …  
    257257        self.student.nationality = u'NG'
    258258        self.browser.open(self.payments_path + '/addop')
    259         self.browser.getControl(name="form.p_category").value = ['welfare']
     259        self.browser.getControl(name="form.p_category").value = ['concessional']
    260260        self.browser.getControl("Create ticket").click()
    261261        self.assertTrue('ticket created' in  self.browser.contents)
    … …  
    269269        self.certificate.study_mode = 'ug_ft'
    270270        self.browser.getLink("CollegePAY", index=0).click()
    271         self.assertTrue('<input type="hidden" name="pay_item_id" value="105" />'
     271        self.assertTrue('<input type="hidden" name="pay_item_id" value="107" />'
    272272                           in self.browser.contents)
    273273        self.assertTrue('Total Amount Authorized:' in self.browser.contents)
    … …  
    276276            in self.browser.contents)
    277277        self.assertTrue(
    278             'item_name="Student Welfare Assurance Fee" item_amt="131700" '
    279             'bank_id="123" acct_num="1006407792"'
     278            'item_name="Concessional Fee" item_amt="131700" '
     279            'bank_id="117" acct_num="1010835352"'
    280280            in self.browser.contents)
    281281
    … …  
    320320        self.student.nationality = u'NG'
    321321        self.browser.open(self.payments_path + '/addop')
    322         self.browser.getControl(name="form.p_category").value = ['schoolfee']
     322        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
    323323        self.browser.getControl("Create ticket").click()
    324324        self.assertTrue('ticket created' in self.browser.contents)

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

    r13418 r13421  
    116116        self.browser.open(self.payments_path)
    117117        self.browser.getLink("Add current session payment ticket").click()
    118         self.browser.getControl(name="form.p_category").value = ['schoolfee']
     118        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
    119119        self.browser.getControl("Create ticket").click()
    120120        self.assertMatches('...Wrong state...',
    … …  
    131131        #                   self.browser.contents)
    132132        self.app['configuration']['2004'].clearance_fee = 666.0
    133         self.browser.getControl(name="form.p_category").value = ['clearance']
     133        self.browser.getControl(name="form.p_category").value = ['clearance_incl']
    134134        self.browser.getControl("Create ticket").click()
    135135        ctrl = self.browser.getControl(name='val_id')
    … …  
    139139        self.student.nationality = u'NG'
    140140        self.browser.open(self.payments_path + '/addop')
    141         self.browser.getControl(name="form.p_category").value = ['schoolfee']
     141        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
    142142        self.browser.getControl("Create ticket").click()
    143143        self.assertMatches('...ticket created...',
    … …  
    169169        # ... no further school fee ticket can be added.
    170170        self.browser.open(self.payments_path + '/addop')
    171         self.browser.getControl(name="form.p_category").value = ['schoolfee']
     171        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
    172172        self.browser.getControl("Create ticket").click()
    173173        self.assertMatches('...Wrong state...',
    … …  
    243243        IWorkflowState(self.student).setState('cleared')
    244244        self.browser.getLink("Add current session payment ticket").click()
    245         self.browser.getControl(name="form.p_category").value = ['schoolfee']
     245        self.browser.getControl(name="form.p_category").value = ['schoolfee_incl']
    246246        self.browser.getControl("Create ticket").click()
    247247        ctrl = self.browser.getControl(name='val_id')
    … …  
    265265        self.assertTrue(
    266266            'zope.mgr - students.browser.OnlinePaymentApproveView '
    267             '- E1000000 - schoolfee payment approved'
     267            '- E1000000 - schoolfee_incl payment approved'
    268268            in logcontent)
    269269        # ... and in payments.log
    … …  
    272272        logcontent = open(logfile).read()
    273273        self.assertTrue(
    274             '"zope.mgr",E1000000,%s,schoolfee,6666.0,AP,,,,,,\n' % value
     274            '"zope.mgr",E1000000,%s,schoolfee_incl,6666.0,AP,,,,,,\n' % value
    275275            in logcontent)
    276276        # Student is in state school fee paid, no activation
Note: See TracChangeset for help on using the changeset viewer.