summaryrefslogtreecommitdiff
path: root/addons/test_mass_mailing
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2019-07-17 10:58:39 +0000
committerThibault Delavallée <tde@odoo.com>2019-07-17 15:50:33 +0000
commit772e1c0cc4e75cec971d2b4e1c820eb54872dc93 (patch)
tree30126a9fa9acabb9f75ab1d0665428180b9cc444 /addons/test_mass_mailing
parent2896aad34e797b6ca65a8efe3c5d71f31500a9a2 (diff)
[REF] mass_mailing: rename mail.mass_mailing.{.contact{_rel}, list{.merge}} models
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 Rename mail.mass_mailing.list and mail.mass_mailing.list to mailing.list and mailing.list.merge. Rename mail.mass_mailing.contact to mailing.contact. Rename mail.mailing_list.list_contact_rel to mailing.contact.subscription. Rationale : * those new names are easier to understand: mailing.list and mailing.contact are less mail-related, especially taking into account that SMS will allow to be less mail-oriented; * those names are easier to read / find / understand; * align wizard and sub-models naming with the main naming; * have a mailing as first part of namespacing; MIGRATION mail.mass_mailing.list model -> mailing.list mail.mass_mailing.list.merge model -> mailing.list.merge mail.mass_mailing.contact model -> mailing.contact mail.mass_mailing.list_contact_rel model -> mailing.contact.subscription mail_mass_mailing_contact_list_rel table -> mailing_contact_list_rel (specific case of a decorated m2m) fields updated (no column change) * mailing.list: subscription_contact_ids -> subscription_ids LINKS Task ID 2037906 Preparing task ID 1997464 (SMS addition in mass mailing) PR #34938
Diffstat (limited to 'addons/test_mass_mailing')
-rw-r--r--addons/test_mass_mailing/tests/test_mail_auto_blacklist.py12
-rw-r--r--addons/test_mass_mailing/tests/test_mass_mailing.py20
2 files changed, 16 insertions, 16 deletions
diff --git a/addons/test_mass_mailing/tests/test_mail_auto_blacklist.py b/addons/test_mass_mailing/tests/test_mail_auto_blacklist.py
index 56db2616fd9..7d79190564a 100644
--- a/addons/test_mass_mailing/tests/test_mail_auto_blacklist.py
+++ b/addons/test_mass_mailing/tests/test_mail_auto_blacklist.py
@@ -6,7 +6,7 @@ import datetime
class TestAutoBlacklist(common.TransactionCase):
def test_mail_bounced_auto_blacklist(self):
- mass_mailing_contacts = self.env['mail.mass_mailing.contact']
+ mass_mailing_contacts = self.env['mailing.contact']
mass_mailing = self.env['mail.mass_mailing']
mail_blacklist = self.env['mail.blacklist']
mail_statistics = self.env['mailing.trace']
@@ -17,28 +17,28 @@ class TestAutoBlacklist(common.TransactionCase):
# create bounced history
mail_statistics.create({
- 'model': 'mail.mass_mailing.contact',
+ 'model': 'mailing.contact',
'res_id': self.mailing_contact_1.id,
'bounced': datetime.datetime.now() - datetime.timedelta(weeks=2),
'email': self.mailing_contact_1.email
})
self.mailing_contact_1._message_receive_bounce(self.mailing_contact_1.email, self.mailing_contact_1)
mail_statistics.create({
- 'model': 'mail.mass_mailing.contact',
+ 'model': 'mailing.contact',
'res_id': self.mailing_contact_1.id,
'bounced': datetime.datetime.now() - datetime.timedelta(weeks=3),
'email': self.mailing_contact_1.email
})
self.mailing_contact_1._message_receive_bounce(self.mailing_contact_1.email, self.mailing_contact_1)
mail_statistics.create({
- 'model': 'mail.mass_mailing.contact',
+ 'model': 'mailing.contact',
'res_id': self.mailing_contact_1.id,
'bounced': datetime.datetime.now() - datetime.timedelta(weeks=4),
'email': self.mailing_contact_1.email
})
self.mailing_contact_1._message_receive_bounce(self.mailing_contact_1.email, self.mailing_contact_1)
mail_statistics.create({
- 'model': 'mail.mass_mailing.contact',
+ 'model': 'mailing.contact',
'res_id': self.mailing_contact_1.id,
'bounced': datetime.datetime.now() - datetime.timedelta(weeks=5),
'email': self.mailing_contact_1.email
@@ -70,7 +70,7 @@ class TestAutoBlacklist(common.TransactionCase):
composer.send_mail()
mail_statistics.create({
- 'model': 'mail.mass_mailing.contact',
+ 'model': 'mailing.contact',
'res_id': self.mailing_contact_1.id,
'bounced': datetime.datetime.now(),
'email': self.mailing_contact_1.email
diff --git a/addons/test_mass_mailing/tests/test_mass_mailing.py b/addons/test_mass_mailing/tests/test_mass_mailing.py
index f9d4e0d845e..15dfadada47 100644
--- a/addons/test_mass_mailing/tests/test_mass_mailing.py
+++ b/addons/test_mass_mailing/tests/test_mass_mailing.py
@@ -68,7 +68,7 @@ class TestMassMail(MassMailingCase):
class TestAccessRights(TransactionCase):
def test_01_mass_mail_blacklist(self):
- mass_mailing_contacts = self.env['mail.mass_mailing.contact']
+ mass_mailing_contacts = self.env['mailing.contact']
mass_mailing = self.env['mail.mass_mailing']
mail_blacklist = self.env['mail.blacklist']
@@ -110,9 +110,9 @@ class TestAccessRights(TransactionCase):
'blacklist ignored email number incorrect, should be equals to 2')
def test_02_mass_mail_simple_opt_out(self):
- mass_mailing_contacts = self.env['mail.mass_mailing.contact']
- mass_mailing_lists = self.env['mail.mass_mailing.list']
- mass_mailing_optout = self.env['mail.mass_mailing.list_contact_rel']
+ mass_mailing_contacts = self.env['mailing.contact']
+ mass_mailing_lists = self.env['mailing.list']
+ mass_mailing_optout = self.env['mailing.contact.subscription']
mass_mailing = self.env['mail.mass_mailing']
# create mailing contact record
@@ -159,9 +159,9 @@ class TestAccessRights(TransactionCase):
'Opt Out ignored email number incorrect, should be equals to 1')
def test_03_mass_mail_multi_opt_out(self):
- mass_mailing_contacts = self.env['mail.mass_mailing.contact']
- mass_mailing_lists = self.env['mail.mass_mailing.list']
- mass_mailing_optout = self.env['mail.mass_mailing.list_contact_rel']
+ mass_mailing_contacts = self.env['mailing.contact']
+ mass_mailing_lists = self.env['mailing.list']
+ mass_mailing_optout = self.env['mailing.contact.subscription']
mass_mailing = self.env['mail.mass_mailing']
# create mailing contact record
@@ -216,9 +216,9 @@ class TestAccessRights(TransactionCase):
'Opt Out ignored email number incorrect, should be equals to 0')
def test_04_mass_mail_multi_users_different_opt_out(self):
- mass_mailing_contacts = self.env['mail.mass_mailing.contact']
- mass_mailing_lists = self.env['mail.mass_mailing.list']
- mass_mailing_optout = self.env['mail.mass_mailing.list_contact_rel']
+ mass_mailing_contacts = self.env['mailing.contact']
+ mass_mailing_lists = self.env['mailing.list']
+ mass_mailing_optout = self.env['mailing.contact.subscription']
mass_mailing = self.env['mail.mass_mailing']
# create mailing contact record