Changeset 13091 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

23 Jun 2015, 05:58:58 (9 years ago)

Author:

Henrik Bettermann

Message:

Make student email field required.

A trick was needed to make test_manage_contact_student work again.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

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

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -275 +275 @@
     email = schema.ASCIILine(
         title = _(u'Email'),
-        required = False,
+        required = True,
         constraint=validate_email,
         )

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

@@ -35 +35 @@
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.testbrowser.testing import Browser
+from zope.interface import implementedBy
+from zope.schema.fieldproperty import FieldProperty
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
@@ -546 +548 @@
         # Managers can contact student
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        # Remove required FieldProperty attribute first ...
+        delattr(Student, 'email')
+        # ... and replace by None
         self.student.email = None
+        # Now we have to add  the FieldProperty attribute again. Otherwise
+        # many other tests below will fail.
+        iface = list(implementedBy(Student))[0]
+        field_property = FieldProperty(iface['email'])
+        setattr(Student, 'email', field_property)
         self.browser.open(self.student_path)
         self.browser.getLink("Send email").click()
@@ -2400 +2410 @@
         self.browser.getLink("Clearance Data").click()
         self.browser.getLink("Start clearance").click()
-        self.student.email = None
-        # Uups, we forgot to fill the email fields
+        self.student.phone = None
+        # Uups, we forgot to fill the phone fields
+        # (email is already required in the interface, but phone not)
         self.browser.getControl("Start clearance").click()
         self.assertMatches('...Not all required fields filled...',
                            self.browser.contents)
         self.browser.open(self.student_path + '/edit_base')
-        self.browser.getControl(name="form.email").value = 'aa@aa.ng'
+        self.browser.getControl(name="form.phone.ext").value = '12345'
         self.browser.getControl("Save").click()
         self.browser.open(self.student_path + '/start_clearance')