Changeset 8436 for main/waeup.kofa/trunk

Timestamp:

13 May 2012, 03:49:37 (13 years ago)

Author:

Henrik Bettermann

Message:

Catch error when sending the contact form but no email address is provided.

Location:

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

Files:

• students/tests/test_browser.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -472 +472 @@
         # Managers can contact student
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.student.email = None
         self.browser.open(self.student_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.student.email = 'xx@yy.zz'
         self.browser.getControl("Send message now").click()
         self.assertTrue('Your message has been sent' in self.browser.contents)

main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py

@@ -165 +165 @@
         body = translate(text, 'waeup.kofa',
             target_language=self.PORTAL_LANGUAGE)
+        if not (from_addr and rcpt_addr):
+            return False
         return send_mail(
             from_name,from_addr,rcpt_name,rcpt_addr,subject,body,config)