summaryrefslogtreecommitdiff
path: root/addons/mail/tests
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2013-11-25 16:00:54 +0100
committerChristophe Simonis <chs@openerp.com>2013-11-25 16:00:54 +0100
commitbb1e256f5b24bb4fc4b64e1fa973f86a30e4bace (patch)
tree95f1de1c67b507b0d10786d04aa0f98bcd22243a /addons/mail/tests
parentf148061b9455e39d3b3e6f316a5c7d586e1aad88 (diff)
parent7baee2822180db919e6754f04c0fa9bc8aaafe92 (diff)
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
Diffstat (limited to 'addons/mail/tests')
-rw-r--r--addons/mail/tests/test_mail_features.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 62c76db5a40..c7f1056c59a 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -294,9 +294,9 @@ class test_mail(TestMail):
'notification email: link should contain the user login')
self.assertIn('message_id=%s' % mail.mail_message_id.id, url,
'notification email: link based on message should contain the mail_message id')
- self.assertNotIn('model', url,
+ self.assertNotIn('model=mail.group', url,
'notification email: link based on message should not contain model')
- self.assertNotIn('res_id', url,
+ self.assertNotIn('res_id=%s' % group_pigs.id, url,
'notification email: link based on message should not contain res_id')
@mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')