From 925f1273d535e0916e098c8cb41766289bb04a06 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 21 May 2021 17:11:14 +0530 Subject: [PATCH] fix: Use email_account_doc to get track_email_status value --- frappe/email/doctype/email_account/test_records.json | 3 ++- frappe/email/doctype/email_queue/email_queue.py | 2 +- frappe/tests/test_email.py | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/email/doctype/email_account/test_records.json b/frappe/email/doctype/email_account/test_records.json index fbe7d9c281..15ca2a886e 100644 --- a/frappe/email/doctype/email_account/test_records.json +++ b/frappe/email/doctype/email_account/test_records.json @@ -19,7 +19,8 @@ "unreplied_for_mins": 20, "send_notification_to": "test_unreplied@example.com", "pop3_server": "pop.test.example.com", - "no_remaining":"0" + "no_remaining":"0", + "track_email_status": 1 }, { "doctype": "ToDo", diff --git a/frappe/email/doctype/email_queue/email_queue.py b/frappe/email/doctype/email_queue/email_queue.py index 076dfc5417..4286b69bfa 100644 --- a/frappe/email/doctype/email_queue/email_queue.py +++ b/frappe/email/doctype/email_queue/email_queue.py @@ -218,7 +218,7 @@ class SendMailContext: '' message = '' - if frappe.conf.use_ssl and self.queue_doc.track_email_status: + if frappe.conf.use_ssl and self.email_account_doc.track_email_status: message = quopri.encodestring( tracker_url_html.format(frappe.local.site, self.queue_doc.communication).encode() ).decode() diff --git a/frappe/tests/test_email.py b/frappe/tests/test_email.py index af90ee7a6b..1f17764a18 100644 --- a/frappe/tests/test_email.py +++ b/frappe/tests/test_email.py @@ -15,6 +15,7 @@ class TestEmail(unittest.TestCase): frappe.db.sql("""delete from `tabEmail Queue Recipient`""") def test_email_queue(self, send_after=None): + frappe.conf.use_ssl = True frappe.sendmail(recipients=['test@example.com', 'test1@example.com'], sender="admin@example.com", reference_doctype='User', reference_name='Administrator', @@ -29,6 +30,9 @@ class TestEmail(unittest.TestCase): self.assertTrue('test1@example.com' in queue_recipients) self.assertEqual(len(queue_recipients), 2) self.assertTrue('' in email_queue[0]['message']) + # check for email tracker + self.assertTrue('frappe.core.doctype.communication.email.mark_email_as_seen' in email_queue[0]['message']) + frappe.conf.use_ssl = False def test_send_after(self): self.test_email_queue(send_after=1)