summaryrefslogtreecommitdiff
path: root/addons/mass_mailing/tests
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/mass_mailing/tests
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/mass_mailing/tests')
-rw-r--r--addons/mass_mailing/tests/test_mass_mailing_list_merge.py8
-rw-r--r--addons/mass_mailing/tests/test_mass_mailing_shortener.py10
2 files changed, 9 insertions, 9 deletions
diff --git a/addons/mass_mailing/tests/test_mass_mailing_list_merge.py b/addons/mass_mailing/tests/test_mass_mailing_list_merge.py
index 3408989d77e..fe8feba73ec 100644
--- a/addons/mass_mailing/tests/test_mass_mailing_list_merge.py
+++ b/addons/mass_mailing/tests/test_mass_mailing_list_merge.py
@@ -9,7 +9,7 @@ class TestMassMailingCommon(common.TransactionCase):
def test_00_test_mass_mailing_list_merge(self):
# Data set up
- mailing_list_A = self.env['mail.mass_mailing.list'].create({
+ mailing_list_A = self.env['mailing.list'].create({
'name': 'A',
'contact_ids': [
(0, 0, {'name': 'Noel Flantier', 'email': 'noel.flantier@example.com'}),
@@ -18,7 +18,7 @@ class TestMassMailingCommon(common.TransactionCase):
]
})
- mailing_list_B = self.env['mail.mass_mailing.list'].create({
+ mailing_list_B = self.env['mailing.list'].create({
'name': 'B',
'contact_ids': [
(0, 0, {'name': 'Icallhimtest', 'email': 'icallhimtest@example.com'}),
@@ -27,7 +27,7 @@ class TestMassMailingCommon(common.TransactionCase):
]
})
- mailing_list_C = self.env['mail.mass_mailing.list'].create({
+ mailing_list_C = self.env['mailing.list'].create({
'name': 'C',
'contact_ids': [
(0, 0, {'name': 'Norberto', 'email': 'norbert@example.com'}),
@@ -39,7 +39,7 @@ class TestMassMailingCommon(common.TransactionCase):
# This test ensure that the mailing lists are correctly merged and no
# duplicates are appearing in C
- result_list = self.env['mass.mailing.list.merge'].create({
+ result_list = self.env['mailing.list.merge'].create({
'src_list_ids': [(4, list_id) for list_id in [mailing_list_A.id, mailing_list_B.id]],
'dest_list_id': mailing_list_C.id,
'merge_options': 'existing',
diff --git a/addons/mass_mailing/tests/test_mass_mailing_shortener.py b/addons/mass_mailing/tests/test_mass_mailing_shortener.py
index d279208264d..5b7ba5cf877 100644
--- a/addons/mass_mailing/tests/test_mass_mailing_shortener.py
+++ b/addons/mass_mailing/tests/test_mass_mailing_shortener.py
@@ -35,23 +35,23 @@ class TestMassMailingShortener(common.TransactionCase):
self.addCleanup(patcher2.stop)
def test_00_test_mass_mailing_shortener(self):
- mailing_list_A = self.env['mail.mass_mailing.list'].create({
+ mailing_list_A = self.env['mailing.list'].create({
'name': 'A',
})
- self.env['mail.mass_mailing.contact'].create({
+ self.env['mailing.contact'].create({
'name': 'User 1', 'email': 'user1@example.com', 'list_ids': [(4, mailing_list_A.id)]
})
- self.env['mail.mass_mailing.contact'].create({
+ self.env['mailing.contact'].create({
'name': 'User 2', 'email': 'user2@example.com', 'list_ids': [(4, mailing_list_A.id)]
})
- self.env['mail.mass_mailing.contact'].create({
+ self.env['mailing.contact'].create({
'name': 'User 3', 'email': 'user3@example.com', 'list_ids': [(4, mailing_list_A.id)]
})
mass_mailing = self.env['mail.mass_mailing'].create({
"reply_to_mode": "email",
"reply_to": "Administrator <admin@yourcompany.example.com>",
- "mailing_model_id": self.env.ref('mass_mailing.model_mail_mass_mailing_list').id,
+ "mailing_model_id": self.env.ref('mass_mailing.model_mailing_list').id,
"mailing_domain": "[('list_ids', 'in', [%d])]" % mailing_list_A.id,
"contact_list_ids": [[6, False, [mailing_list_A.id]]],
"mass_mailing_campaign_id": False,