Xavier Morel
a1f45aab0e
In `prepend_html_content`, if body `html_body` and `html_content` are `Markup` objects, the processing of `html_content` through `re.sub` will strip away the `Markup` flag, leading to the later concatenation of the body and content first escaping the content (to safely convert it to a `Markup`) before performing the concatenation proper. As a result, the `preview` of a `mailing.mailing` would be double-escaped, and the markup hiding it would instead be printed as part of the body. Assume that the type of `html_content` is str-compatible, and immediately rewrap the value after processing it through `re.sub`. This should do nothing if `html_content` was an actual `str`, and will re-flag it as a `Markup` if it was one. Also change the finding of the insertion point to use `re.search`, I don't understand why this uses `finditer`, it just makes the code more complicated. closes odoo/odoo#71090 Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
62 lines
2.5 KiB
Python
62 lines
2.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
import lxml.html
|
|
|
|
from odoo.addons.test_mass_mailing.tests.common import TestMassMailCommon
|
|
from odoo.tests.common import users
|
|
from odoo.tools import mute_logger
|
|
|
|
|
|
class TestMailingTest(TestMassMailCommon):
|
|
|
|
@users('user_marketing')
|
|
@mute_logger('odoo.addons.mail.models.mail_render_mixin')
|
|
def test_mailing_test_button(self):
|
|
mailing = self.env['mailing.mailing'].create({
|
|
'name': 'TestButton',
|
|
'subject': 'Subject ${object.name}',
|
|
'preview': 'Preview ${object.name}',
|
|
'state': 'draft',
|
|
'mailing_type': 'mail',
|
|
'body_html': '<p>Hello ${object.name}</p>',
|
|
'mailing_model_id': self.env['ir.model']._get('res.partner').id,
|
|
})
|
|
mailing_test = self.env['mailing.mailing.test'].create({
|
|
'email_to': 'test@test.com',
|
|
'mass_mailing_id': mailing.id,
|
|
})
|
|
|
|
with self.mock_mail_gateway():
|
|
mailing_test.send_mail_test()
|
|
|
|
# not great but matches send_mail_test, maybe that should be a method
|
|
# on mailing_test?
|
|
record = self.env[mailing.mailing_model_real].search([], limit=1)
|
|
first_child = lxml.html.fromstring(self._mails.pop()['body']).xpath('//body/*[1]')[0]
|
|
self.assertEqual(first_child.tag, 'div')
|
|
self.assertIn('display:none', first_child.get('style'),
|
|
"the preview node should be hidden")
|
|
self.assertEqual(first_child.text.strip(), "Preview " + record.name,
|
|
"the preview node should contain the preview text")
|
|
|
|
# Test if bad jinja in the subject raises an error
|
|
mailing.write({'subject': 'Subject ${object.name_id.id}'})
|
|
with self.mock_mail_gateway(), self.assertRaises(Exception):
|
|
mailing_test.send_mail_test()
|
|
|
|
# Test if bad jinja in the body raises an error
|
|
mailing.write({
|
|
'subject': 'Subject ${object.name}',
|
|
'body_html': '<p>Hello ${object.name_id.id}</p>',
|
|
})
|
|
with self.mock_mail_gateway(), self.assertRaises(Exception):
|
|
mailing_test.send_mail_test()
|
|
|
|
# Test if bad jinja in the preview raises an error
|
|
mailing.write({
|
|
'body_html': '<p>Hello ${object.name}</p>',
|
|
'preview': 'Preview ${object.name_id.id}',
|
|
})
|
|
with self.mock_mail_gateway(), self.assertRaises(Exception):
|
|
mailing_test.send_mail_test()
|