[MERGE] [FIX] email_template: template does not erase the wizard content anymore. Updated tests accordingly, because of the signature management that changed slightly.

bzr revid: tde@openerp.com-20130214121011-g6y2ouw24g9e2oz9

2 files changed, 7 insertions, 7 deletions

diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 2ee8bf10297..b87b6d63000 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -45,8 +45,8 @@ class test_message_compose(TestMailBase):
         # Mail data
         _subject1 = 'Pigs'
         _subject2 = 'Bird'
-        _body_html1 = '<div><p>Fans of Pigs, unite !\n</p><p>Admin</p></div>'
-        _body_html2 = '<div><p>I am angry !\n</p><p>Admin</p></div>'
+        _body_html1 = 'Fans of Pigs, unite !'
+        _body_html2 = 'I am angry !'
         _attachments = [
             {'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment')},
             {'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment')}
@@ -113,7 +113,7 @@ class test_message_compose(TestMailBase):
         partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])])
         # Test: mail.compose.message: subject, body, partner_ids
         self.assertEqual(compose.subject, _subject1, 'mail.compose.message subject incorrect')
-        self.assertEqual(compose.body, _body_html1, 'mail.compose.message body incorrect')
+        self.assertIn(_body_html1, compose.body, 'mail.compose.message body incorrect')
         self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
         # Test: mail.compose.message: attachments
         # Test: mail.message: attachments
@@ -159,8 +159,8 @@ class test_message_compose(TestMailBase):
         # Test: subject, body
         self.assertEqual(message_pigs.subject, _subject1, 'mail.message subject on Pigs incorrect')
         self.assertEqual(message_bird.subject, _subject2, 'mail.message subject on Bird incorrect')
-        self.assertEqual(message_pigs.body, _body_html1, 'mail.message body on Pigs incorrect')
-        self.assertEqual(message_bird.body, _body_html2, 'mail.message body on Bird incorrect')
+        self.assertIn(_body_html1, message_pigs.body, 'mail.message body on Pigs incorrect')
+        self.assertIn(_body_html2, message_bird.body, 'mail.message body on Bird incorrect')
         # Test: partner_ids: p_a_id (default) + 3 newly created partners
         message_pigs_pids = [partner.id for partner in message_pigs.notified_partner_ids]
         message_bird_pids = [partner.id for partner in message_bird.notified_partner_ids]
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index ad30b3817f5..b39ed4e5639 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -150,8 +150,8 @@ class mail_compose_message(osv.TransientModel):
             values = {}
         # get values to return
         email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, res_id, context)
-        email_dict.update(values)
-        return email_dict
+        values.update(email_dict)
+        return values
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
         return self.pool.get('email.template').render_template(cr, uid, template, model, res_id, context=context)