From 67b5f988929bf56bf3aaa4054fc759e2bfbb3b4c Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Thu, 20 Feb 2014 12:43:46 +0530 Subject: [PATCH] do not style inline if in test case --- frappe/utils/email_lib/bulk.py | 2 +- frappe/utils/email_lib/email_body.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/frappe/utils/email_lib/bulk.py b/frappe/utils/email_lib/bulk.py index 0d581a59c9..43c8a21d92 100644 --- a/frappe/utils/email_lib/bulk.py +++ b/frappe/utils/email_lib/bulk.py @@ -145,4 +145,4 @@ def flush(from_test=False): def clear_outbox(): """remove mails older than 30 days in Outbox""" frappe.conn.sql("""delete from `tabBulk Email` where - datediff(now(), creation) > 30""") \ No newline at end of file + datediff(now(), creation) > 30""") diff --git a/frappe/utils/email_lib/email_body.py b/frappe/utils/email_lib/email_body.py index dc406947fb..77c98a49eb 100644 --- a/frappe/utils/email_lib/email_body.py +++ b/frappe/utils/email_lib/email_body.py @@ -192,17 +192,19 @@ class EMail: return self.msg_root.as_string() def get_formatted_html(subject, message, footer=None, print_html=None): - if frappe.local.flags.in_test: - return message - message = scrub_urls(message) - - return inline_css(frappe.get_template("templates/emails/standard.html").render({ + rendered_email = frappe.get_template("templates/emails/standard.html").render({ "content": message, "footer": get_footer(footer), "title": subject, "print_html": print_html - })) + }) + + # if in a test case, do not inline css + if frappe.local.flags.in_test: + return rendered_email + + return inline_css(rendered_email) def get_footer(footer=None): """append a footer (signature)"""