diff options
| author | Thibault Delavallée <tde@odoo.com> | 2019-07-04 11:19:53 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-07-17 15:39:06 +0000 |
| commit | f5b1105c9752ba5836d24e71f3780a611ec1801f (patch) | |
| tree | 6050a7dba386332c310c63f005494933e033edf9 /addons/test_mass_mailing/tests/test_mass_mailing.py | |
| parent | b3e7fd040b934ee1a60ddaf8c866af3e787e484c (diff) | |
[IMP] mass_mailing: perform small code fixes / move
PURPOSE
Mass mailing is currently a bit messy. As SMS will be added as a way to notify
people in mass through SMS let us take this opportunity to somehow clean this
application: organization, light code cleaning, model renaming.
SPECIFICATIONS
Move some code bits / fields declarations to reorder them. Purpose is to
make code easier to understand and find. Funny we found two override of create
that have been merged. An override of name create is not necessary considering
code was present in one of the two merged create.
Make internal methods private.
Rename send_mail to action_send_mail to avoid confusion with composer and
template send_mail methods.
LINKS
Task ID 2037906
Preparing task ID 1997464 (SMS addition in mass mailing)
PR #34938
Diffstat (limited to 'addons/test_mass_mailing/tests/test_mass_mailing.py')
| -rw-r--r-- | addons/test_mass_mailing/tests/test_mass_mailing.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/test_mass_mailing/tests/test_mass_mailing.py b/addons/test_mass_mailing/tests/test_mass_mailing.py index 28ba0596e6b..f9d4e0d845e 100644 --- a/addons/test_mass_mailing/tests/test_mass_mailing.py +++ b/addons/test_mass_mailing/tests/test_mass_mailing.py @@ -42,7 +42,7 @@ class TestMassMail(MassMailingCase): 'mailing_domain': [('id', 'in', self.mm_recs.ids)], }) - mailing.send_mail() + mailing.action_send_mail() # basic test emails are sent self.assertEqual(mailing.sent, 5) @@ -92,7 +92,7 @@ class TestAccessRights(TransactionCase): self.mailing_contact_4.id, self.mailing_contact_5.id])], 'body_html': 'This is mass mail marketing demo'}) self.mass_mailing.put_in_queue() - res_ids = self.mass_mailing.get_remaining_recipients() + 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, @@ -296,7 +296,7 @@ class TestOnResPartner(TransactionCase): 'body_html': 'This is mass mail marketing demo'}) self.mass_mailing.mailing_model_real = 'res.partner' self.mass_mailing.put_in_queue() - res_ids = self.mass_mailing.get_remaining_recipients() + 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, |