Changeset 16213 for main

Timestamp:

25 Aug 2020, 15:18:15 (4 years ago)

Author:

Henrik Bettermann

Message:

Remove contact email header and add footer.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/tests/test_browser.py (modified) (3 diffs)
• src/waeup/kofa/utils/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Remove contact email header and add footer.
 
 * Implement webservice `get_payment`.

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

@@ -28 +28 @@
 import os
 import grok
+import logging
 from zc.async.testing import wait_for_result
 from zope.event import notify
@@ -452 +453 @@
     # Tests for Student class views and pages
 
+    def setUp(self):
+        super(OfficerUITests, self).setUp()
+        self.setup_logging()
+        return
+
+    def tearDown(self):
+        super(OfficerUITests, self).tearDown()
+        self.teardown_logging()
+        return
+
+    def setup_logging(self):
+        # setup a log-handler that catches all fake mailer output
+        self.stream = StringIO()
+        handler = logging.StreamHandler(self.stream)
+        logger = logging.getLogger('test.smtp')
+        logger.addHandler(handler)
+        logger.setLevel(logging.INFO)
+        return
+
+    def get_fake_smtp_output(self):
+        # get output generated by fake mailer
+        self.stream.flush()
+        self.stream.seek(0)
+        return self.stream.read()
+
+    def teardown_logging(self):
+        # remove the log handler for fake mailer output
+        logger = logging.getLogger('test.smtp')
+        handlers = [x for x in logger.handlers]
+        for handler in handlers:
+            logger.removeHandler(handler)
+        return
+
     def test_student_properties(self):
         self.student['studycourse'].current_level = 100
@@ -607 +641 @@
         self.browser.getControl("Send message now").click()
         self.assertTrue('Your message has been sent' in self.browser.contents)
+        self.assertMatches(
+            'Sending email from no-reply@waeup.org to xx@yy.zz:'
+            '\nMessage:'
+            '\nmsg: MIME-Version: 1.0'
+            '\nmsg: Content-Type: text/plain; charset="us-ascii"'
+            '\nmsg: Content-Transfer-Encoding: 7bit'
+            '\nmsg: From: Manager <no-reply@waeup.org>'
+            '\nmsg: To: Anna Tester <xx@yy.zz>'
+            '\nmsg: Reply-To: Manager <contact@waeup.org>'
+            '\nmsg: Subject: Important subject'
+            '\nmsg:'
+            '\nmsg: Hello!'
+            '\nmsg:'
+            '\nmsg: ---'
+            '\nmsg: Manager (id: zope.mgr)'
+            '\nmsg: Sample University'
+            '\nmsg:',
+            self.get_fake_smtp_output()
+            )
         return
 

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

@@ -251 +251 @@
         """
         config = grok.getSite()['configuration']
-        text = _(u"""Fullname: ${a}
-User Id: ${b}
-User Type: ${c}
-Portal: ${d}
-
-${e}
+        text = _(u"""${e}
+
+---
+${a} (id: ${b})
+${d}
 """)
         text = _(text, mapping={