Changeset 8627

Timestamp:

5 Jun 2012, 06:04:00 (12 years ago)

Author:

Henrik Bettermann

Message:

Do not block application record if password has been set for the first time and
let students re-use the ApplicantRegistrationPage? in case they have entered a wrong
email address.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -1034 +1034 @@
                     self.flash(_('No application record found.'))
                     return
-                elif applicant.password is not None:
-                    self.flash(_('Your password has already been set. '
+                elif applicant.password is not None and \
+                    applicant.state != INITIALIZED:
+                    self.flash(_('Your password has already been set and used. '
                                  'Please proceed to the login page.'))
                     return

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -489 +489 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.fill_correct_values()
+        self.assertTrue(IUserAccount(self.applicant).checkPassword('apwd'))
         self.browser.getControl("Save").click()
         self.assertMatches('...Form has been saved...', self.browser.contents)
@@ -931 +932 @@
         self.assertTrue('No application record found.'
             in self.browser.contents)
-        # Even with the correct firstname we can't register because
-        # password has already been set.
+        # Even with the correct firstname we can't register if a
+        # password has been set and used.
+        IWorkflowState(self.applicant).setState('started')
         self.browser.getControl(name="form.firstname").value = 'John'
         self.browser.getControl(name="form.reg_number").value = '1234'
         self.browser.getControl("Get login credentials").click()
-        self.assertTrue('Your password has already been set.'
+        self.assertTrue('Your password has already been set and used.'
             in self.browser.contents)
-        # We unset the password and try to register again.
-        IUserAccount(
-            self.app['applicants']['app2009'][
-            self.applicant.application_number]).context.password = None
+        #IUserAccount(
+        #    self.app['applicants']['app2009'][
+        #    self.applicant.application_number]).context.password = None
+        # Even without unsetting the password we can re-register if state
+        # is 'initialized'
+        IWorkflowState(self.applicant).setState('initialized')
         self.browser.open(self.container_path + '/register')
         # The firstname field, used for verification, is not case-sensitive.
         self.browser.getControl(name="form.firstname").value = 'jOhn'
         self.browser.getControl(name="form.reg_number").value = '1234'
-        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
+        self.browser.getControl(name="form.email").value = 'new@yy.zz'
         self.browser.getControl("Get login credentials").click()
         # Yeah, we succeded ...
@@ -955 +959 @@
         results = list(
             cat.searchResults(
-            email=('xx@yy.zz', 'xx@yy.zz')))
+            email=('new@yy.zz', 'new@yy.zz')))
         self.assertEqual(self.applicant,results[0])
         return