Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7199 from RobertSchouten/email_cc_dev

Browse Source 
email cc test fixes for frappe/frappe#2441
This commit is contained in:
Nabin Hait 2016-12-13 11:31:06 +05:30 committed by GitHub
commit ee877fd631
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py
View File

@ -56,6 +56,7 @@ class TestDailyWorkSummary(unittest.TestCase):
hour = frappe.utils.nowtime().split(':')[0]
frappe.db.sql('delete from `tabDaily Work Summary`')
frappe.db.sql('delete from `tabEmail Queue`')
frappe.db.sql('delete from `tabEmail Queue Recipient`')
frappe.db.sql('delete from `tabCommunication`')
# setup email to trigger at this our
@ -75,6 +76,6 @@ class TestDailyWorkSummary(unittest.TestCase):
employees = frappe.get_all('Employee', fields = ['user_id'],
filters=dict(company='_Test Company', status='Active'))
emails = frappe.get_all('Email Queue', fields=['recipient', 'message', 'message_id'])
emails = frappe.db.sql("""select r.recipient, q.message, q.message_id from `tabEmail Queue` as q, `tabEmail Queue Recipient` as r where q.name = r.parent""", as_dict=1)
return settings, employees, emails