pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] mass_mailing : add blacklist and opt_out demo data

Browse Source 
In order to understand more easily the impact of an opt out
or a blacklisted contact on the interface, blacklist and
opt-out demo data are added.

Tests updated to only test mails on contacts created inside
the test environement and not with demo data.

Task ID 1892998
Closes PR #27674
This commit is contained in:
David Beguin
2018-11-09 08:46:35 +00:00
parent 8e15a23ca6
commit bf441b984f
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mass_mailing/data/mass_mailing_demo.xml
+22 -1
View File
@@ -22,13 +22,34 @@
<record id="mass_mail_contact_2" model="mail.mass_mailing.contact">
<field name="name">Beverly Bridge</field>
<field name="email">bb@example.com</field>
<field name="list_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_list_2'), ref('mass_mailing.mass_mail_list_2')])]"/>
<field name="list_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_list_2')])]"/>
</record>
<record id="mass_mail_contact_3" model="mail.mass_mailing.contact">
<field name="name">Carol Cartridge</field>
<field name="email">cc@example.com</field>
<field name="list_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_list_2')])]"/>
</record>
<record id="mass_mail_contact_4" model="mail.mass_mailing.contact">
<field name="name">David Dawson</field>
<field name="email">dd@example.com</field>
</record>
<record id="mass_mail_contact_5" model="mail.mass_mailing.contact">
<field name="name">Elsa Ericson</field>
<field name="email">ee@example.com</field>
<field name="list_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_list_2')])]"/>
</record>
<!-- Create Opt-out Records -->
<record id="mass_mail_contact_list_rel_1" model="mail.mass_mailing.list_contact_rel">
<field name="list_id" eval="ref('mass_mailing.mass_mail_list_2')"/>
<field name="contact_id" eval="ref('mass_mailing.mass_mail_contact_4')"/>
<field name="opt_out">True</field>
</record>
<!-- Create Blacklist Records -->
<record id="blacklist_1" model="mail.blacklist">
<field name="email">ee@example.com</field>
</record>
<!-- Create campaign and mailings -->
<record id="mass_mail_tag_1" model="mail.mass_mailing.tag">
addons/test_mass_mailing/tests/test_mass_mailing.py
+3 -6
View File
@@ -138,7 +138,6 @@ class TestAccessRights(TransactionCase):
'body_html': 'This is mass mail marketing demo'})
self.mass_mailing.contact_list_ids = [mailing_list_1.id]
self.mass_mailing.put_in_queue()
res_ids = self.mass_mailing.get_remaining_recipients()
composer_values = {
'body': self.mass_mailing.convert_links()[self.mass_mailing.id],
'subject': self.mass_mailing.name,
@@ -149,7 +148,7 @@ class TestAccessRights(TransactionCase):
'mailing_list_ids': [(4, l.id) for l in self.mass_mailing.contact_list_ids],
}
composer = self.env['mail.compose.message'].with_context(
active_ids=res_ids,
active_ids=[mailing_contact_1.id, mailing_contact_2.id],
mass_mailing_seen_list=self.mass_mailing._get_seen_list(),
mass_mailing_opt_out_list=self.mass_mailing._get_opt_out_list()).create(composer_values)
composer.send_mail()
@@ -194,7 +193,6 @@ class TestAccessRights(TransactionCase):
'body_html': 'This is mass mail marketing demo'})
self.mass_mailing.contact_list_ids = [mailing_list_1.id, mailing_list_2.id]
self.mass_mailing.put_in_queue()
res_ids = self.mass_mailing.get_remaining_recipients()
composer_values = {
'body': self.mass_mailing.convert_links()[self.mass_mailing.id],
'subject': self.mass_mailing.name,
@@ -205,7 +203,7 @@ class TestAccessRights(TransactionCase):
'mailing_list_ids': [(4, l.id) for l in self.mass_mailing.contact_list_ids],
}
composer = self.env['mail.compose.message'].with_context(
active_ids=res_ids,
active_ids=[mailing_contact_1.id, mailing_contact_2.id],
mass_mailing_seen_list=self.mass_mailing._get_seen_list(),
mass_mailing_opt_out_list=self.mass_mailing._get_opt_out_list()).create(composer_values)
composer.send_mail()
@@ -244,7 +242,6 @@ class TestAccessRights(TransactionCase):
'body_html': 'This is mass mail marketing demo'})
self.mass_mailing.contact_list_ids = [mailing_list_1.id]
self.mass_mailing.put_in_queue()
res_ids = self.mass_mailing.get_remaining_recipients()
composer_values = {
'body': self.mass_mailing.convert_links()[self.mass_mailing.id],
'subject': self.mass_mailing.name,
@@ -255,7 +252,7 @@ class TestAccessRights(TransactionCase):
'mailing_list_ids': [(4, l.id) for l in self.mass_mailing.contact_list_ids],
}
composer = self.env['mail.compose.message'].with_context(
active_ids=res_ids,
active_ids=[mailing_contact_1.id, mailing_contact_2.id],
mass_mailing_seen_list=self.mass_mailing._get_seen_list(),
mass_mailing_opt_out_list=self.mass_mailing._get_opt_out_list()).create(composer_values)
composer.send_mail()