Ignore:
Timestamp:
21 Sep 2012, 08:19:35 (12 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:
2 edited

Legend:

Unmodified
Added
Removed

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

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

    r9209 r9211  
    118118        self.manage_clearance_path = self.student_path + '/manage_clearance'
    119119        self.edit_personal_path = self.student_path + '/edit_personal'
    120         self.manage_personal_path = self.student_path + '/manage_personal'
    121120        self.studycourse_path = self.student_path + '/studycourse'
    122121        self.payments_path = self.student_path + '/payments'
    … …  
    171170        self.app['faculties']['fac1']['dep1'].courses.addCourse(
    172171            self.course)
    173         self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
     172        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
    174173            self.course, level=100)
    175174
    … …  
    404403    layer = FunctionalLayer
    405404
    406     def test_student_properties(self):
    407         self.student['studycourse'].current_level = 100
    408         self.assertEqual(self.student.current_level, 100)
    409         self.student['studycourse'].current_session = 2011
    410         self.assertEqual(self.student.current_session, 2011)
    411         self.student['studycourse'].current_verdict = 'A'
    412         self.assertEqual(self.student.current_verdict, 'A')
    413         return
    414 
    415405    def test_basic_auth(self):
    416406        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    … …  
    464454        self.assertEqual(self.browser.headers['Status'], '200 Ok')
    465455        self.assertEqual(self.browser.url, self.personal_path)
    466         self.browser.getLink("Manage").click()
    467         self.assertEqual(self.browser.headers['Status'], '200 Ok')
    468         self.assertEqual(self.browser.url, self.manage_personal_path)
    469         self.browser.open(self.personal_path)
    470456        self.browser.getLink("Edit").click()
    471457        self.assertEqual(self.browser.headers['Status'], '200 Ok')
    … …  
    488474        self.assertEqual(self.browser.headers['Status'], '200 Ok')
    489475        self.assertEqual(self.browser.url, self.history_path)
    490         self.assertMatches('...Admitted by Manager...',
     476        self.assertMatches('...Student admitted by Manager...',
    491477                           self.browser.contents)
    492478        # Only the Application Slip does not exist
    … …  
    768754        self.assertEqual(student['studycourse'].current_session, 2005) # +1
    769755        self.assertEqual(student['studycourse'].current_level, 200) # +100
    770         self.assertEqual(student['studycourse'].current_verdict, '0') # 0 = Zero = not set
     756        self.assertEqual(student['studycourse'].current_verdict, 'NY') # NY = not set
    771757        self.assertEqual(student['studycourse'].previous_verdict, 'A')
    772758        self.browser.getControl(name="transition").value = ['register_courses']
    … …  
    776762        self.browser.getControl(name="transition").value = ['return']
    777763        self.browser.getControl("Save").click()
    778         return
    779 
    780     def test_manage_pg_workflow(self):
    781         # Managers can pass through the whole workflow
    782         IWorkflowState(self.student).setState('school fee paid')
    783         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    784         student = self.app['students'][self.student_id]
    785         self.browser.open(self.manage_student_path)
    786         self.assertTrue('<option value="reset6">' in self.browser.contents)
    787         self.assertTrue('<option value="register_courses">' in self.browser.contents)
    788         self.assertTrue('<option value="reset5">' in self.browser.contents)
    789         self.certificate.study_mode = 'pg_ft'
    790         self.browser.open(self.manage_student_path)
    791         self.assertFalse('<option value="reset6">' in self.browser.contents)
    792         self.assertFalse('<option value="register_courses">' in self.browser.contents)
    793         self.assertTrue('<option value="reset5">' in self.browser.contents)
    794764        return
    795765
    … …  
    806776        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    807777        self.browser.open(datacenter_path)
    808         self.browser.getLink('Upload data').click()
     778        self.browser.getLink('Upload CSV file').click()
    809779        filecontents = StringIO(open('students.csv', 'rb').read())
    810780        filewidget = self.browser.getControl(name='uploadfile:file')
    811781        filewidget.add_file(filecontents, 'text/plain', 'students.csv')
    812782        self.browser.getControl(name='SUBMIT').click()
    813         self.browser.getLink('Process data').click()
     783        self.browser.getLink('Batch processing').click()
    814784        button = lookup_submit_value(
    815785            'select', 'students_zope.mgr.csv', self.browser)
    … …  
    832802""")
    833803        self.browser.open(datacenter_path)
    834         self.browser.getLink('Upload data').click()
     804        self.browser.getLink('Upload CSV file').click()
    835805        filecontents = StringIO(open('studycourses.csv', 'rb').read())
    836806        filewidget = self.browser.getControl(name='uploadfile:file')
    837807        filewidget.add_file(filecontents, 'text/plain', 'studycourses.csv')
    838808        self.browser.getControl(name='SUBMIT').click()
    839         self.browser.getLink('Process data').click()
     809        self.browser.getLink('Batch processing').click()
    840810        button = lookup_submit_value(
    841811            'select', 'studycourses_zope.mgr.csv', self.browser)
    … …  
    947917        self.assertTrue('clearance started' in self.browser.contents)
    948918        self.browser.open(self.history_path)
    949         self.assertTrue("Reset to 'clearance started' by My Public Name" in
     919        self.assertTrue("Reset to 'clearance' by My Public Name" in
    950920            self.browser.contents)
    951921        IWorkflowInfo(self.student).fireTransition('request_clearance')
    … …  
    976946        self.app['users'].addUser('mrsadvise', 'mrsadvisesecret')
    977947        self.app['users']['mrsadvise'].email = 'mradvise@foo.ng'
    978         self.app['users']['mrsadvise'].title = u'Helen Procter'
     948        self.app['users']['mrsadvise'].title = 'Helen Procter'
    979949        # Assign local CourseAdviser100 role for a certificate
    980950        cert = self.app['faculties']['fac1']['dep1'].certificates['CERT1']
    … …  
    1027997        # the 100L CA does see the 'Validate' button
    1028998        self.browser.open(L110_student_path)
    1029         self.assertFalse('Validate courses' in self.browser.contents)
     999        self.assertFalse('Validate' in self.browser.contents)
    10301000        IWorkflowInfo(self.student).fireTransition('register_courses')
    10311001        self.browser.open(L110_student_path)
    1032         self.assertFalse('Validate courses' in self.browser.contents)
     1002        self.assertFalse('Validate' in self.browser.contents)
    10331003        self.student['studycourse'].current_level = 110
    10341004        self.browser.open(L110_student_path)
    1035         self.assertTrue('Validate courses' in self.browser.contents)
     1005        self.assertTrue('Validate' in self.browser.contents)
    10361006        # ... but a 100L CA does not see the button on other levels
    10371007        studylevel2 = StudentStudyLevel()
    … …  
    10411011        L200_student_path = self.studycourse_path + '/200'
    10421012        self.browser.open(L200_student_path)
    1043         self.assertFalse('Validate courses' in self.browser.contents)
     1013        self.assertFalse('Validate' in self.browser.contents)
    10441014        self.browser.open(L110_student_path)
    10451015        self.browser.getLink("Validate courses").click()
    10461016        self.assertTrue('Course list has been validated' in self.browser.contents)
    10471017        self.assertTrue('courses validated' in self.browser.contents)
    1048         self.assertEqual(self.student['studycourse']['110'].validated_by,
    1049             'Helen Procter')
    1050         self.assertMatches(
    1051             '<YYYY-MM-DD hh:mm:ss>',
    1052             self.student['studycourse']['110'].validation_date.strftime(
    1053                 "%Y-%m-%d %H:%M:%S"))
    10541018        self.browser.getLink("Reject courses").click()
    10551019        self.assertTrue('Course list request has been annulled.'
    … …  
    10591023            '/contactstudent?subject=%s' % urlmessage)
    10601024        self.assertTrue('school fee paid' in self.browser.contents)
    1061         self.assertTrue(self.student['studycourse']['110'].validated_by is None)
    1062         self.assertTrue(self.student['studycourse']['110'].validation_date is None)
    10631025        IWorkflowInfo(self.student).fireTransition('register_courses')
    10641026        self.browser.open(L110_student_path)
    … …  
    11801142        # and can perform actions
    11811143        IWorkflowInfo(self.student).fireTransition('admit')
    1182         # Students can't login if their account is suspended/deactivated
    1183         self.student.suspended = True
    11841144        self.browser.open(self.login_path)
    11851145        self.browser.getControl(name="form.login").value = self.student_id
    11861146        self.browser.getControl(name="form.password").value = 'spwd'
    11871147        self.browser.getControl("Login").click()
    1188         self.assertTrue(
    1189             'Your account has been deactivated.' in self.browser.contents)
    1190         self.student.suspended = False
    1191         self.browser.getControl("Login").click()
    1192         self.assertTrue(
    1193             'You logged in.' in self.browser.contents)
    1194         # Admitted student can upload a passport picture
     1148        # Student can upload a passport picture
    11951149        self.browser.open(self.student_path + '/change_portrait')
    11961150        ctrl = self.browser.getControl(name='passportuploadedit')
    … …  
    12031157            '<img align="middle" height="125px" src="passport.jpg" />'
    12041158            in self.browser.contents)
    1205         # Students can open admission letter
    1206         self.browser.getLink("Base Data").click()
    1207         self.browser.getLink("Download admission letter").click()
    1208         self.assertEqual(self.browser.headers['Status'], '200 Ok')
    1209         self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
    12101159        # Student can view the clearance data
    1211         self.browser.open(self.student_path)
    12121160        self.browser.getLink("Clearance Data").click()
    12131161        # Student can't open clearance edit form before starting clearance
    … …  
    12221170        self.assertMatches('...Not all required fields filled...',
    12231171                           self.browser.contents)
    1224         self.browser.open(self.student_path + '/edit_base')
    1225         self.browser.getControl(name="form.email").value = 'aa@aa.ng'
    1226         self.browser.getControl("Save").click()
     1172        self.student.email = 'aa@aa.ng'
    12271173        self.browser.open(self.student_path + '/start_clearance')
    12281174        self.browser.getControl(name="ac_series").value = '3'
    … …  
    12391185        # Set the correct owner
    12401186        self.existing_clrac.owner = self.student_id
    1241         # clr_code might be set (and thus returns None) due importing
    1242         # an empty clr_code column.
    1243         self.student.clr_code = None
    12441187        self.browser.getControl("Start clearance now").click()
    12451188        self.assertMatches('...Clearance process has been started...',
    … …  
    12921235        self.browser.getControl("Create course list now").click()
    12931236        self.browser.getLink("100").click()
    1294         self.browser.getLink("Edit course list").click()
     1237        self.browser.getLink("Add and remove courses").click()
    12951238        self.browser.getControl("Add course ticket").click()
    12961239        self.browser.getControl(name="form.course").value = ['COURSE1']
    … …  
    13051248        self.browser.getControl("Create course list now").click()
    13061249        self.browser.getLink("200").click()
    1307         self.browser.getLink("Edit course list").click()
     1250        self.browser.getLink("Add and remove courses").click()
    13081251        self.browser.getControl("Add course ticket").click()
    13091252        self.browser.getControl(name="form.course").value = ['COURSE1']
    … …  
    13431286        self.assertEqual(self.student.state, 'courses registered')
    13441287        return
    1345 
    1346     def test_student_clearance_wo_clrcode(self):
    1347         IWorkflowState(self.student).setState('clearance started')
    1348         self.browser.open(self.login_path)
    1349         self.browser.getControl(name="form.login").value = self.student_id
    1350         self.browser.getControl(name="form.password").value = 'spwd'
    1351         self.browser.getControl("Login").click()
    1352         self.student.clearance_locked = False
    1353         self.browser.open(self.edit_clearance_path)
    1354         self.browser.getControl(name="form.date_of_birth").value = '09/10/1961'
    1355         self.browser.getControl("Save and request clearance").click()
    1356         self.assertMatches('...Clearance has been requested...',
    1357                            self.browser.contents)
    13581288
    13591289    def test_manage_payments(self):
    … …  
    15861516        # The new SFE-0 pin can be used for starting new session
    15871517        self.browser.open(self.studycourse_path)
    1588         self.browser.getLink('Start new session').click()
     1518        self.browser.getLink('Start session').click()
    15891519        pin = self.app['accesscodes']['SFE-0'].keys()[0]
    15901520        parts = pin.split('-')[1:]
    … …  
    15981528        return
    15991529
    1600     def test_student_previous_payments(self):
    1601         configuration = createObject('waeup.SessionConfiguration')
    1602         configuration.academic_session = 2000
    1603         configuration.clearance_fee = 3456.0
    1604         configuration.booking_fee = 123.4
    1605         self.student['studycourse'].entry_session = 2002
    1606         self.app['configuration'].addSessionConfiguration(configuration)
    1607         configuration2 = createObject('waeup.SessionConfiguration')
    1608         configuration2.academic_session = 2003
    1609         configuration2.clearance_fee = 3456.0
    1610         configuration2.booking_fee = 123.4
    1611         self.student['studycourse'].entry_session = 2002
    1612         self.app['configuration'].addSessionConfiguration(configuration2)
    1613         # Login
    1614         self.browser.open(self.login_path)
    1615         self.browser.getControl(name="form.login").value = self.student_id
    1616         self.browser.getControl(name="form.password").value = 'spwd'
    1617         self.browser.getControl("Login").click()
    1618 
    1619         # Students can add previous school fee payment tickets in any state.
    1620         IWorkflowState(self.student).setState('courses registered')
    1621         self.browser.open(self.payments_path)
    1622         self.browser.getControl("Add online payment ticket").click()
    1623         self.browser.getControl(name="form.p_category").value = ['schoolfee']
    1624         self.browser.getControl("Create ticket").click()
    1625 
    1626         # Amount cannot be determined since the state is not
    1627         # 'cleared' or 'returning'
    1628         self.assertMatches('...Amount could not be determined...',
    1629                            self.browser.contents)
    1630         self.assertMatches('...Would you like to pay for a previous session?...',
    1631                            self.browser.contents)
    1632 
    1633         # Previous session payment form is provided
    1634         self.browser.getControl(name="form.p_category").value = ['schoolfee']
    1635         self.browser.getControl(name="form.p_session").value = ['2000']
    1636         self.browser.getControl(name="form.p_level").value = ['300']
    1637         self.browser.getControl("Create ticket").click()
    1638         self.assertMatches('...The previous session must not fall below...',
    1639                            self.browser.contents)
    1640         self.browser.getControl(name="form.p_category").value = ['schoolfee']
    1641         self.browser.getControl(name="form.p_session").value = ['2004']
    1642         self.browser.getControl(name="form.p_level").value = ['300']
    1643         self.browser.getControl("Create ticket").click()
    1644         self.assertMatches('...This is not a previous session...',
    1645                            self.browser.contents)
    1646         self.browser.getControl(name="form.p_category").value = ['schoolfee']
    1647         self.browser.getControl(name="form.p_session").value = ['2003']
    1648         self.browser.getControl(name="form.p_level").value = ['300']
    1649         self.browser.getControl("Create ticket").click()
    1650         self.assertMatches('...ticket created...',
    1651                            self.browser.contents)
    1652         ctrl = self.browser.getControl(name='val_id')
    1653         value = ctrl.options[0]
    1654         self.browser.getLink(value).click()
    1655         self.assertMatches('...Amount Authorized...',
    1656                            self.browser.contents)
    1657         self.assertEqual(self.student['payments'][value].amount_auth, 20000.0)
    1658 
    1659         # Payment session is properly set
    1660         self.assertEqual(self.student['payments'][value].p_session, 2003)
    1661         self.assertEqual(self.student['payments'][value].p_level, 300)
    1662 
    1663         # We simulate the approval
    1664         self.browser.open(self.browser.url + '/fake_approve')
    1665         self.assertMatches('...Payment approved...',
    1666                           self.browser.contents)
    1667 
    1668         # No AC has been created
    1669         self.assertEqual(len(self.app['accesscodes']['SFE-0'].keys()), 0)
    1670         self.assertTrue(self.student['payments'][value].ac is None)
    1671 
    1672         # Current payment flag is set False
    1673         self.assertFalse(self.student['payments'][value].p_current)
    1674         return
    1675 
    1676     def test_student_postgraduate_payments(self):
     1530    def test_postgraduate_payments(self):
    16771531        self.certificate.study_mode = 'pg_ft'
    16781532        self.certificate.start_level = 999
    … …  
    16981552                           self.browser.contents)
    16991553        # Payment session and level are current ones.
    1700         # Postgrads have to pay school_fee_1.
     1554        # Postgrads have to school_fee_1.
    17011555        self.assertEqual(self.student['payments'][value].amount_auth, 40000.0)
    17021556        self.assertEqual(self.student['payments'][value].p_session, 2004)
    … …  
    17111565        # The new SFE-0 pin can be used for starting session
    17121566        self.browser.open(self.studycourse_path)
    1713         self.browser.getLink('Start new session').click()
     1567        self.browser.getLink('Start session').click()
    17141568        pin = self.app['accesscodes']['SFE-0'].keys()[0]
    17151569        parts = pin.split('-')[1:]
    … …  
    17511605        # The new SFE-1 pin can be used for starting new session
    17521606        self.browser.open(self.studycourse_path)
    1753         self.browser.getLink('Start new session').click()
     1607        self.browser.getLink('Start session').click()
    17541608        self.browser.getControl(name="ac_series").value = sfeseries
    17551609        self.browser.getControl(name="ac_number").value = sfenumber
    … …  
    19931847        self.browser.getControl(name="form.identifier").value = '123'
    19941848        self.browser.getControl(name="form.email").value = 'aa@aa.ng'
    1995         self.browser.getControl("Send login credentials").click()
     1849        self.browser.getControl("Get login credentials").click()
    19961850        self.assertTrue('An email with' in self.browser.contents)
     1851
     1852    def test_reindex(self):
     1853        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
     1854        self.browser.open('http://localhost/app/reindex')
     1855        self.assertTrue('No catalog name provided' in self.browser.contents)
     1856        self.browser.open('http://localhost/app/reindex?ctlg=xyz')
     1857        self.assertTrue('xyz_catalog does not exist' in self.browser.contents)
     1858        cat = queryUtility(ICatalog, name='students_catalog')
     1859        results = cat.searchResults(student_id=(None, None))
     1860        self.assertEqual(len(results),1)
     1861        cat.clear()
     1862        results = cat.searchResults(student_id=(None, None))
     1863        self.assertEqual(len(results),0)
     1864        self.browser.open('http://localhost/app/reindex?ctlg=students')
     1865        self.assertTrue('1 students re-indexed' in self.browser.contents)
     1866        results = cat.searchResults(student_id=(None, None))
     1867        self.assertEqual(len(results),1)
    19971868
    19981869    def test_change_current_mode(self):
    … …  
    20171888        self.assertTrue('Employer' in self.browser.contents)
    20181889
    2019     def test_activate_deactivate_buttons(self):
    2020         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    2021         self.browser.open(self.student_path)
    2022         self.browser.getLink("Deactivate").click()
    2023         self.assertTrue(
    2024             'Student account has been deactivated.' in self.browser.contents)
    2025         self.assertTrue(
    2026             'Base Data (account deactivated)' in self.browser.contents)
    2027         self.assertTrue(self.student.suspended)
    2028         self.browser.getLink("Activate").click()
    2029         self.assertTrue(
    2030             'Student account has been activated.' in self.browser.contents)
    2031         self.assertFalse(
    2032             'Base Data (account deactivated)' in self.browser.contents)
    2033         self.assertFalse(self.student.suspended)
    2034         # History messages have been added ...
    2035         self.browser.getLink("History").click()
    2036         self.assertTrue(
    2037             'Student account deactivated by Manager<br />' in self.browser.contents)
    2038         self.assertTrue(
    2039             'Student account activated by Manager<br />' in self.browser.contents)
    2040         # ... and actions have been logged.
    2041         logfile = os.path.join(
    2042             self.app['datacenter'].storage, 'logs', 'students.log')
    2043         logcontent = open(logfile).read()
    2044         self.assertTrue('zope.mgr - students.browser.StudentDeactivatePage - '
    2045                         'K1000000 - account deactivated' in logcontent)
    2046         self.assertTrue('zope.mgr - students.browser.StudentActivatePage - '
    2047                         'K1000000 - account activated' in logcontent)
    2048 
    2049     def test_student_transfer(self):
    2050         # Add second certificate
    2051         self.certificate2 = createObject('waeup.Certificate')
    2052         self.certificate2.code = u'CERT2'
    2053         self.certificate2.study_mode = 'ug_ft'
    2054         self.certificate2.start_level = 999
    2055         self.certificate2.end_level = 999
    2056         self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
    2057             self.certificate2)
    2058 
    2059         # Add study level to old study course
    2060         studylevel = createObject(u'waeup.StudentStudyLevel')
    2061         studylevel.level = 200
    2062         self.student['studycourse'].addStudentStudyLevel(
    2063             self.certificate, studylevel)
    2064 
    2065         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    2066         self.browser.open(self.student_path)
    2067         self.browser.getLink("Transfer").click()
    2068         self.browser.getControl(name="form.certificate").value = ['CERT2']
    2069         self.browser.getControl(name="form.current_session").value = ['2011']
    2070         self.browser.getControl(name="form.current_level").value = ['200']
    2071         self.browser.getControl("Transfer").click()
    2072         self.assertTrue(
    2073             'Current level does not match certificate levels'
    2074             in self.browser.contents)
    2075         self.browser.getControl(name="form.current_level").value = ['999']
    2076         self.browser.getControl("Transfer").click()
    2077         self.assertTrue('Successfully transferred' in self.browser.contents)
    2078 
    2079         # Add study level to new study course
    2080         studylevel = createObject(u'waeup.StudentStudyLevel')
    2081         studylevel.level = 200
    2082         self.student['studycourse'].addStudentStudyLevel(
    2083             self.certificate, studylevel)
    2084 
    2085         # Edit and add pages are locked for old study courses
    2086         self.browser.open(self.student_path + '/studycourse/manage')
    2087         self.assertFalse('The requested form is locked' in self.browser.contents)
    2088         self.browser.open(self.student_path + '/studycourse_1/manage')
    2089         self.assertTrue('The requested form is locked' in self.browser.contents)
    2090 
    2091         self.browser.open(self.student_path + '/studycourse/start_session')
    2092         self.assertFalse('The requested form is locked' in self.browser.contents)
    2093         self.browser.open(self.student_path + '/studycourse_1/start_session')
    2094         self.assertTrue('The requested form is locked' in self.browser.contents)
    2095 
    2096         IWorkflowState(self.student).setState('school fee paid')
    2097         self.browser.open(self.student_path + '/studycourse/add')
    2098         self.assertFalse('The requested form is locked' in self.browser.contents)
    2099         self.browser.open(self.student_path + '/studycourse_1/add')
    2100         self.assertTrue('The requested form is locked' in self.browser.contents)
    2101 
    2102         self.browser.open(self.student_path + '/studycourse/200/manage')
    2103         self.assertFalse('The requested form is locked' in self.browser.contents)
    2104         self.browser.open(self.student_path + '/studycourse_1/200/manage')
    2105         self.assertTrue('The requested form is locked' in self.browser.contents)
    2106 
    2107         self.browser.open(self.student_path + '/studycourse/200/validate_courses')
    2108         self.assertFalse('The requested form is locked' in self.browser.contents)
    2109         self.browser.open(self.student_path + '/studycourse_1/200/validate_courses')
    2110         self.assertTrue('The requested form is locked' in self.browser.contents)
    2111 
    2112         self.browser.open(self.student_path + '/studycourse/200/reject_courses')
    2113         self.assertFalse('The requested form is locked' in self.browser.contents)
    2114         self.browser.open(self.student_path + '/studycourse_1/200/reject_courses')
    2115         self.assertTrue('The requested form is locked' in self.browser.contents)
    2116 
    2117         self.browser.open(self.student_path + '/studycourse/200/add')
    2118         self.assertFalse('The requested form is locked' in self.browser.contents)
    2119         self.browser.open(self.student_path + '/studycourse_1/200/add')
    2120         self.assertTrue('The requested form is locked' in self.browser.contents)
    2121 
    2122         self.browser.open(self.student_path + '/studycourse/200/edit')
    2123         self.assertFalse('The requested form is locked' in self.browser.contents)
    2124         self.browser.open(self.student_path + '/studycourse_1/200/edit')
    2125         self.assertTrue('The requested form is locked' in self.browser.contents)
    2126 
    21271890class StudentRequestPWTests(StudentsFullSetup):
    21281891    # Tests for student registration
    … …  
    21311894
    21321895    def test_request_pw(self):
    2133         # Student with wrong number can't be found.
     1896        # Student with wrong reg_number can't be found.
    21341897        self.browser.open('http://localhost/app/requestpw')
    21351898        self.browser.getControl(name="form.firstname").value = 'Anna'
    2136         self.browser.getControl(name="form.number").value = 'anynumber'
     1899        self.browser.getControl(name="form.reg_number").value = 'anynumber'
    21371900        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
    2138         self.browser.getControl("Send login credentials").click()
     1901        self.browser.getControl("Get login credentials").click()
    21391902        self.assertTrue('No student record found.'
    21401903            in self.browser.contents)
    … …  
    21431906        self.browser.open('http://localhost/app/requestpw')
    21441907        self.browser.getControl(name="form.firstname").value = 'Johnny'
    2145         self.browser.getControl(name="form.number").value = '123'
     1908        self.browser.getControl(name="form.reg_number").value = '123'
    21461909        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
    2147         self.browser.getControl("Send login credentials").click()
     1910        self.browser.getControl("Get login credentials").click()
    21481911        self.assertTrue('No student record found.'
    21491912            in self.browser.contents)
    … …  
    21511914        # password has been set and used.
    21521915        self.browser.getControl(name="form.firstname").value = 'Anna'
    2153         self.browser.getControl(name="form.number").value = '123'
    2154         self.browser.getControl("Send login credentials").click()
     1916        self.browser.getControl(name="form.reg_number").value = '123'
     1917        self.browser.getControl("Get login credentials").click()
    21551918        self.assertTrue('Your password has already been set and used.'
    21561919            in self.browser.contents)
    … …  
    21591922        # The firstname field, used for verification, is not case-sensitive.
    21601923        self.browser.getControl(name="form.firstname").value = 'aNNa'
    2161         self.browser.getControl(name="form.number").value = '123'
     1924        self.browser.getControl(name="form.reg_number").value = '123'
    21621925        self.browser.getControl(name="form.email").value = 'new@yy.zz'
    2163         self.browser.getControl("Send login credentials").click()
     1926        self.browser.getControl("Get login credentials").click()
    21641927        # Yeah, we succeded ...
    2165         self.assertTrue('Your password request was successful.'
    2166             in self.browser.contents)
    2167         # We can also use the matric_number instead.
    2168         self.browser.open('http://localhost/app/requestpw')
    2169         self.browser.getControl(name="form.firstname").value = 'aNNa'
    2170         self.browser.getControl(name="form.number").value = '234'
    2171         self.browser.getControl(name="form.email").value = 'new@yy.zz'
    2172         self.browser.getControl("Send login credentials").click()
    21731928        self.assertTrue('Your password request was successful.'
    21741929            in self.browser.contents)
    … …  
    21791934            email=('new@yy.zz', 'new@yy.zz')))
    21801935        self.assertEqual(self.student,results[0])
    2181         logfile = os.path.join(
    2182             self.app['datacenter'].storage, 'logs', 'main.log')
    2183         logcontent = open(logfile).read()
    2184         self.assertTrue('zope.anybody - students.browser.StudentRequestPasswordPage - '
    2185                         '234 (K1000000) - new@yy.zz' in logcontent)
    21861936        return
Note: See TracChangeset for help on using the changeset viewer.