Ignore:
Timestamp:
21 Sep 2012, 08:19:35 (13 years ago)
Author:
uli
Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:
main/waeup.kofa/branches/uli-zc-async
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/branches/uli-zc-async

  • main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/tests/test_applicantcopier.py

    r9209 r9211  
    2121import os
    2222import grok
    23 from datetime import datetime
    2423from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
    2524from zope.event import notify
    … …  
    2928from waeup.kofa.interfaces import IExtFileStore, IFileStoreNameChooser
    3029from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
    31 
    32 session = datetime.now().year - 2
    3330
    3431class ApplicantCopierFunctionalTests(ApplicantsFullSetup):
    … …  
    7067        self.browser.getControl(name="form.course_admitted").value = ['CERT1']
    7168        self.browser.getControl("Save").click()
    72         # Maybe the certificate has meanwhile been removed
    73         del self.app['faculties']['fac1']['dep1'].certificates['CERT1']
    74         (success, msg) = self.applicant.createStudent()
    75         self.assertFalse(success)
    76         self.assertTrue('ConstraintNotSatisfied: CERT1' in msg)
    77         # Ok, lets add the certificate and try again
    78         self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
    79             self.certificate)
    8069        (success, msg) = self.applicant.createStudent()
    8170        self.assertTrue('created' in msg)
    … …  
    9382        self.assertEqual(student.firstname, 'John')
    9483        self.assertEqual(student.lastname, 'Tester')
    95         # student_id set in application record?
    96         self.assertEqual(self.applicant.student_id, student.student_id)
    9784        # Check if passport image has been copied
    9885        storage = getUtility(IExtFileStore)
    … …  
    123110        # Has the student studycourse the correct attributes?
    124111        self.assertEqual(student['studycourse'].certificate.code, 'CERT1')
    125         self.assertEqual(student['studycourse'].entry_session, session)
     112        self.assertEqual(student['studycourse'].entry_session, 2009)
    126113        self.assertEqual(student['studycourse'].entry_mode, 'ug_ft')
    127         self.assertEqual(student['studycourse'].current_session, session)
     114        self.assertEqual(student['studycourse'].current_session, 2009)
    128115        self.assertEqual(student['studycourse'].current_level, 100)
    129116

  • main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/tests/test_authentication.py

    r9209 r9211  
    6464    email = None
    6565    phone = None
    66     suspended = False
    6766
    6867

  • main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/tests/test_browser.py

    r9209 r9211  
    2323import tempfile
    2424import grok
    25 from datetime import datetime
    2625from StringIO import StringIO
    2726from datetime import datetime, date, timedelta
    … …  
    4746PH_LEN = 2059  # Length of placeholder file
    4847
    49 session_1 = datetime.now().year - 2
    50 container_name_1 = u'app%s' % session_1
    51 session_2 = datetime.now().year - 1
    52 container_name_2 = u'app%s' % session_2
    53 
    5448class ApplicantsFullSetup(FunctionalTestCase):
    5549    # A test case that only contains a setup and teardown
    … …  
    8680        self.manage_root_path = self.root_path + '/@@manage'
    8781        self.add_container_path = self.root_path + '/@@add'
    88         self.container_path = 'http://localhost/app/applicants/%s' % container_name_1
     82        self.container_path = 'http://localhost/app/applicants/app2009'
    8983        self.manage_container_path = self.container_path + '/@@manage'
    9084
    9185        # Add an applicants container
    9286        applicantscontainer = ApplicantsContainer()
    93         applicantscontainer.code = container_name_1
     87        applicantscontainer.code = u'app2009'
    9488        applicantscontainer.prefix = 'app'
    95         applicantscontainer.year = session_1
    96         applicantscontainer.title = u'This is the %s container' % container_name_1
     89        applicantscontainer.year = 2009
     90        applicantscontainer.title = u'This is the app2009 container'
    9791        applicantscontainer.application_category = 'basic'
    9892        applicantscontainer.mode = 'create'
    … …  
    10195        applicantscontainer.startdate = datetime.now(pytz.utc) - delta
    10296        applicantscontainer.enddate = datetime.now(pytz.utc) + delta
    103         self.app['applicants'][container_name_1] = applicantscontainer
    104         self.applicantscontainer = self.app['applicants'][container_name_1]
     97        self.app['applicants']['app2009'] = applicantscontainer
     98        self.applicantscontainer = self.app['applicants']['app2009']
    10599
    106100        # Populate university
    … …  
    141135        self.applicant.reg_number = u'1234'
    142136        self.applicant.course1 = certificate
    143         app['applicants'][container_name_1].addApplicant(self.applicant)
     137        app['applicants']['app2009'].addApplicant(self.applicant)
    144138        IUserAccount(
    145             self.app['applicants'][container_name_1][
     139            self.app['applicants']['app2009'][
    146140            self.applicant.application_number]).setPassword('apwd')
    147141        self.manage_path = 'http://localhost/app/applicants/%s/%s/%s' % (
    148             container_name_1, self.applicant.application_number, 'manage')
     142            'app2009', self.applicant.application_number, 'manage')
    149143        self.edit_path = 'http://localhost/app/applicants/%s/%s/%s' % (
    150             container_name_1, self.applicant.application_number, 'edit')
     144            'app2009', self.applicant.application_number, 'edit')
    151145        self.view_path = 'http://localhost/app/applicants/%s/%s' % (
    152             container_name_1, self.applicant.application_number)
     146            'app2009', self.applicant.application_number)
    153147
    154148    def login(self):
    … …  
    309303            'There were errors' in self.browser.contents)
    310304        self.browser.getControl(name="form.prefix").value = ['app']
    311         self.browser.getControl(name="form.year").value = [str(session_2)]
     305        self.browser.getControl(name="form.year").value = ['2010']
    312306        self.browser.getControl(name="form.mode").value = ['create']
    313307        self.browser.getControl(
    … …  
    323317        self.browser.open(self.add_container_path)
    324318        self.browser.getControl(name="form.prefix").value = ['app']
    325         self.browser.getControl(name="form.year").value = [str(session_2)]
     319        self.browser.getControl(name="form.year").value = ['2010']
    326320        self.browser.getControl(name="form.mode").value = ['create']
    327321        self.browser.getControl(
    … …  
    332326        self.browser.open(self.manage_root_path)
    333327        ctrl = self.browser.getControl(name='val_id')
    334         ctrl.getControl(value=container_name_2).selected = True
     328        ctrl.getControl(value='app2010').selected = True
    335329        self.browser.getControl("Remove selected", index=0).click()
    336330        self.assertTrue('Successfully removed:' in self.browser.contents)
    337331        self.browser.open(self.add_container_path)
    338332        self.browser.getControl(name="form.prefix").value = ['app']
    339         self.browser.getControl(name="form.year").value = [str(session_2)]
     333        self.browser.getControl(name="form.year").value = ['2010']
    340334        self.browser.getControl(name="form.mode").value = ['create']
    341335        #self.browser.getControl(name="form.ac_prefix").value = ['APP']
    … …  
    343337            name="form.application_category").value = ['basic']
    344338        self.browser.getControl("Add applicants container").click()
    345         del self.app['applicants'][container_name_2]
     339        del self.app['applicants']['app2010']
    346340        ctrl = self.browser.getControl(name='val_id')
    347         ctrl.getControl(value=container_name_2).selected = True
     341        ctrl.getControl(value='app2010').selected = True
    348342        self.browser.getControl("Remove selected", index=0).click()
    349343        self.assertMatches('...Could not delete...', self.browser.contents)
    … …  
    471465        self.browser.open(self.slip_path)
    472466        self.assertTrue(
    473             'Please pay and submit before trying to download the application slip.'
     467            'Please pay before trying to download the application slip.'
    474468            in self.browser.contents)
    475469        # If applicant is in correct state the pdf slip can be opened.
    476         IWorkflowState(self.applicant).setState('submitted')
     470        IWorkflowState(self.applicant).setState('paid')
    477471        self.browser.open(self.manage_path)
    478472        self.browser.getLink("Download application slip").click()
    … …  
    499493            self.browser.headers['content-length'], str(PH_LEN))
    500494
    501     def test_applicant_login(self):
    502         self.applicant.suspended = True
    503         self.login()
    504         self.assertTrue(
    505             'You entered invalid credentials.' in self.browser.contents)
    506         self.applicant.suspended = False
    507         self.browser.getControl("Login").click()
    508         self.assertTrue(
    509             'You logged in.' in self.browser.contents)
    510 
    511495    def test_applicant_access(self):
    512496        # Applicants can edit their record
    513497        self.browser.open(self.login_path)
    514498        self.login()
    515         self.assertTrue(
    516             'You logged in.' in self.browser.contents)
    517499        self.browser.open(self.edit_path)
    518500        self.assertTrue(self.browser.url != self.login_path)
    … …  
    717699            in self.browser.contents)
    718700        configuration = SessionConfiguration()
    719         configuration.academic_session = session_1
     701        configuration.academic_session = 2009
    720702        configuration.application_fee = 200.0
    721703        self.app['configuration'].addSessionConfiguration(configuration)
    … …  
    745727        payment_id = self.applicant.keys()[0]
    746728        payment = self.applicant[payment_id]
    747         self.assertEqual(payment.p_item,'This is the %s container' % container_name_1)
    748         self.assertEqual(payment.p_session, session_1)
     729        self.assertEqual(payment.p_item,'This is the app2009 container')
     730        self.assertEqual(payment.p_session,2009)
    749731        self.assertEqual(payment.p_category,'application')
    750732        self.assertEqual(payment.amount_auth,200.0)
    … …  
    839821        self.browser.getControl("Final Submit").click()
    840822        self.assertTrue(
    841             'Application submitted' in self.browser.contents)
     823            '... submitted ...' in self.browser.contents)
    842824        # ... or allow submission after deadline.
    843825        IWorkflowState(self.applicant).setState('paid')
    … …  
    848830        self.browser.getControl("Final Submit").click()
    849831        self.assertTrue(
    850             'Application submitted' in self.browser.contents)
     832            '... submitted ...' in self.browser.contents)
    851833        self.browser.goBack(count=1)
    852834        self.browser.getControl("Save").click()
    … …  
    935917        self.browser.getControl(name="form.phone.area").value = '555'
    936918        self.browser.getControl(name="form.phone.ext").value = '6666666'
    937         self.browser.getControl("Send login credentials").click()
     919        self.browser.getControl("Get login credentials").click()
    938920        self.assertEqual(self.browser.url,
    939921            self.container_path + '/registration_complete?email=xx%40yy.zz')
    … …  
    962944        self.browser.getControl(name="form.reg_number").value = 'anynumber'
    963945        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
    964         self.browser.getControl("Send login credentials").click()
     946        self.browser.getControl("Get login credentials").click()
    965947        self.assertTrue('No application record found.'
    966948            in self.browser.contents)
    … …  
    972954        self.browser.getControl(name="form.reg_number").value = '1234'
    973955        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
    974         self.browser.getControl("Send login credentials").click()
     956        self.browser.getControl("Get login credentials").click()
    975957        self.assertTrue('An error occurred.' in self.browser.contents)
    976958        # Let's set this attribute manually
    … …  
    981963        self.browser.getControl(name="form.reg_number").value = '1234'
    982964        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
    983         self.browser.getControl("Send login credentials").click()
     965        self.browser.getControl("Get login credentials").click()
    984966        # Anonymous is not informed that firstname verification failed.
    985967        # It seems that the record doesn't exist.
    … …  
    991973        self.browser.getControl(name="form.firstname").value = 'John'
    992974        self.browser.getControl(name="form.reg_number").value = '1234'
    993         self.browser.getControl("Send login credentials").click()
     975        self.browser.getControl("Get login credentials").click()
    994976        self.assertTrue('Your password has already been set and used.'
    995977            in self.browser.contents)
    996978        #IUserAccount(
    997         #    self.app['applicants'][container_name_1][
     979        #    self.app['applicants']['app2009'][
    998980        #    self.applicant.application_number]).context.password = None
    999981        # Even without unsetting the password we can re-register if state
    … …  
    1005987        self.browser.getControl(name="form.reg_number").value = '1234'
    1006988        self.browser.getControl(name="form.email").value = 'new@yy.zz'
    1007         self.browser.getControl("Send login credentials").click()
     989        self.browser.getControl("Get login credentials").click()
    1008990        # Yeah, we succeded ...
    1009991        self.assertTrue('Your registration was successful.'
    … …  
    10211003        self.browser.getControl(name="form.identifier").value = '1234'
    10221004        self.browser.getControl(name="form.email").value = 'aa@aa.ng'
    1023         self.browser.getControl("Send login credentials").click()
     1005        self.browser.getControl("Get login credentials").click()
    10241006        self.assertTrue('No record found' in self.browser.contents)
    10251007        self.applicant.email = 'aa@aa.ng'
    … …  
    10291011        self.browser.getControl(name="form.identifier").value = '1234'
    10301012        self.browser.getControl(name="form.email").value = 'aa@aa.ng'
    1031         self.browser.getControl("Send login credentials").click()
     1013        self.browser.getControl("Get login credentials").click()
    10321014        self.assertTrue(
    10331015            'An email with your user name and password has been sent'

  • main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/tests/test_export.py

    r9209 r9211  
    120120        applicant.course_admitted = self.certificate
    121121        applicant.notice = u'Some notice\nin lines.'
     122        applicant.screening_score = 98
     123        applicant.screening_venue = u'Exam Room'
    122124        applicant.password = 'any password'
    123125        result_entry = ResultEntry(
    … …  
    142144            'course_admitted,date_of_birth,display_fullname,email,firstname,'
    143145            'history,lastname,locked,middlename,notice,password,phone,'
    144             'reg_number,sex,state,'
    145             'student_id,suspended,container_code\r\n'
     146            'reg_number,screening_score,screening_venue,sex,state,'
     147            'student_id,container_code\r\n'
    146148            'dp2011_654321,,654321,,,,,Anna Tester,,Anna,'
    147149            in result)
    148150        self.assertTrue(
    149151            'Application initialized by system\'],Tester,'
    150             '0,,,,,,,initialized,,0,dp2011\r\n'
     152            '0,,,,,,,,,initialized,,dp2011\r\n'
    151153            in result)
    152154        return
    … …  
    166168            'course_admitted,date_of_birth,display_fullname,email,firstname,'
    167169            'history,lastname,locked,middlename,notice,password,phone,'
    168             'reg_number,sex,state,'
    169             'student_id,suspended,container_code\r\n'
     170            'reg_number,screening_score,screening_venue,sex,state,'
     171            'student_id,container_code\r\n'
    170172            'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
    171173            'Anna M. Tester,anna@sample.com,Anna,'
    … …  
    174176            'Application initialized by system\'],'
    175177            'Tester,0,M.,"Some notice\nin lines.",any password,'
    176             '+234-123-12345#,123456,f,initialized,,0,dp2011\r\n'
     178            '+234-123-12345,123456,98,Exam Room,f,initialized,,dp2011\r\n'
    177179            in result)
    178180
    … …  
    190192            'course_admitted,date_of_birth,display_fullname,email,firstname,'
    191193            'history,lastname,locked,middlename,notice,password,phone,'
    192             'reg_number,sex,state,'
    193             'student_id,suspended,container_code\r\n'
     194            'reg_number,screening_score,screening_venue,sex,state,'
     195            'student_id,container_code\r\n'
    194196            'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
    195197            'Anna M. Tester,anna@sample.com,Anna,'
    … …  
    198200            'Application initialized by system\'],'
    199201            'Tester,0,M.,"Some notice\nin lines.",any password,'
    200             '+234-123-12345#,123456,f,initialized,,0,dp2011\r\n'
    201             in result)
    202         return
     202            '+234-123-12345,123456,98,Exam Room,f,initialized,,dp2011\r\n'
     203            in result)
     204        return
Note: See TracChangeset for help on using the changeset viewer.