summaryrefslogtreecommitdiff
path: root/addons/test_mail
diff options
context:
space:
mode:
Diffstat (limited to 'addons/test_mail')
-rw-r--r--addons/test_mail/tests/test_mail_activity.py44
-rw-r--r--addons/test_mail/tests/test_performance.py4
2 files changed, 46 insertions, 2 deletions
diff --git a/addons/test_mail/tests/test_mail_activity.py b/addons/test_mail/tests/test_mail_activity.py
index 7fe7ba51981..b75a9b960cc 100644
--- a/addons/test_mail/tests/test_mail_activity.py
+++ b/addons/test_mail/tests/test_mail_activity.py
@@ -148,6 +148,50 @@ class TestActivityFlow(TestActivityCommon):
activity.with_user(self.user_admin).write({'user_id': self.user_employee.id})
self.assertEqual(activity.user_id, self.user_employee)
+ def test_action_feedback_attachment(self):
+ Partner = self.env['res.partner']
+ Activity = self.env['mail.activity']
+ Attachment = self.env['ir.attachment']
+ Message = self.env['mail.message']
+
+ partner = self.env['res.partner'].create({
+ 'name': 'Tester',
+ })
+
+ activity = Activity.create({
+ 'summary': 'Test',
+ 'activity_type_id': 1,
+ 'res_model_id': self.env.ref('base.model_res_partner').id,
+ 'res_id': partner.id,
+ })
+
+ attachments = Attachment
+ attachments += Attachment.create({
+ 'name': 'test',
+ 'res_name': 'test',
+ 'res_model': 'mail.activity',
+ 'res_id': activity.id,
+ 'datas': 'test',
+ })
+ attachments += Attachment.create({
+ 'name': 'test2',
+ 'res_name': 'test',
+ 'res_model': 'mail.activity',
+ 'res_id': activity.id,
+ 'datas': 'testtest',
+ })
+
+ # Adding the attachments to the activity
+ activity.attachment_ids = attachments
+
+ # Checking if the attachment has been forwarded to the message
+ # when marking an activity as "Done"
+ activity.action_feedback()
+ activity_message = Message.search([], order='id desc', limit=1)
+ self.assertEqual(set(activity_message.attachment_ids.ids), set(attachments.ids))
+ for attachment in attachments:
+ self.assertEqual(attachment.res_id, activity_message.id)
+ self.assertEqual(attachment.res_model, activity_message._name)
@tests.tagged('mail_activity')
class TestActivityMixin(TestActivityCommon):
diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index b952fe73388..85b1f24980f 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -229,7 +229,7 @@ class TestMailAPIPerformance(BaseMailPerformance):
#voip module read activity_type during create leading to one less query in enterprise on action_feedback
category = activity.activity_type_id.category
- with self.assertQueryCount(__system__=17, emp=21):
+ with self.assertQueryCount(__system__=18, emp=22):
activity.action_feedback(feedback='Zizisse Done !')
@users('__system__', 'emp')
@@ -246,7 +246,7 @@ class TestMailAPIPerformance(BaseMailPerformance):
record.write({'name': 'Dupe write'})
- with self.assertQueryCount(__system__=18, emp=21):
+ with self.assertQueryCount(__system__=19, emp=22):
record.action_close('Dupe feedback')
self.assertEqual(record.activity_ids, self.env['mail.activity'])