diff options
Diffstat (limited to 'addons/test_mass_mailing/tests')
| -rw-r--r-- | addons/test_mass_mailing/tests/test_mail_auto_blacklist.py | 12 | ||||
| -rw-r--r-- | addons/test_mass_mailing/tests/test_mass_mailing.py | 20 |
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 |