Changeset 12537

Timestamp:

1 Feb 2015, 07:38:12 (10 years ago)

Author:

Henrik Bettermann

Message:

Email address must be required.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• interfaces.py (modified) (1 diff)
• tests/sample_customer_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/interfaces.py

@@ -128 +128 @@
     email = TextLineChoice(
         title = _(u'Email'),
-        required = False,
+        required = True,
         constraint=validate_email,
         source = contextual_email_source,

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data.csv

@@ -1 @@
-customer_id,firstname,lastname,reg_number,date_of_birth,,phone,sex,state
+customer_id,firstname,lastname,reg_number,date_of_birth,email,phone,sex,state
 X666666,Aaren,Pieri,1,1990-01-02,aa@aa.ng,1234,M,requested
 Y777777,Claus,Finau,2,1990-01-03,bb@aa.ng,1234,m,requested

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py

@@ -137 +137 @@
         customer.lastname = u'Tester'
         customer.middlename = u'M.'
+        customer.email = u'bb@bb.bb'
         customer.date_of_birth = datetime.date(1981, 2, 4)
         #customer.sex = 'f'

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -351 +351 @@
         # Managers can contact customer
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.customer.email = None
         self.browser.open(self.customer_path)
         self.browser.getLink("Send email").click()
         self.browser.getControl(name="form.subject").value = 'Important subject'
         self.browser.getControl(name="form.body").value = 'Hello!'
-        self.browser.getControl("Send message now").click()
-        self.assertTrue('An smtp server error occurred' in self.browser.contents)
-        self.customer.email = u'xx@yy.zz'
         self.browser.getControl("Send message now").click()
         self.assertTrue('Your message has been sent' in self.browser.contents)