diff options
| author | David Beguin <dbe@odoo.com> | 2018-10-11 11:17:47 +0000 |
|---|---|---|
| committer | David Beguin <dbe@odoo.com> | 2018-11-09 08:46:35 +0000 |
| commit | bf441b984f0c3a192fcdfecd0f0b3662f12038d4 (patch) | |
| tree | eef26a8a4aa59495417e159866525da57fbc37c0 /addons/test_mass_mailing/tests | |
| parent | 8e15a23ca66fbc4225f2ac5b347c5ce490a37995 (diff) | |
[IMP] mass_mailing : add blacklist and opt_out demo data
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
Diffstat (limited to 'addons/test_mass_mailing/tests')
| -rw-r--r-- | addons/test_mass_mailing/tests/test_mass_mailing.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/addons/test_mass_mailing/tests/test_mass_mailing.py b/addons/test_mass_mailing/tests/test_mass_mailing.py index 6629be54f9f..c18d19a6bea 100644 --- a/addons/test_mass_mailing/tests/test_mass_mailing.py +++ b/addons/test_mass_mailing/tests/test_mass_mailing.py @@ -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() |