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

fix for tests

Browse Source
This commit is contained in:
Rushabh Mehta 2018-05-16 13:05:13 +05:30
parent 0b628386de
commit e07b332514
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/department/test_records.json
View File

@ -1,4 +1,4 @@
[
{"doctype":"Department", "department_name":"_Test Department"},
{"doctype":"Department", "department_name":"_Test Department 1"}
{"doctype":"Department", "department_name":"_Test Department", "company": "_Test Company"},
{"doctype":"Department", "department_name":"_Test Department 1", "company": "_Test Company"}
]

6
erpnext/hr/doctype/employee/test_records.json
View File

@ -3,7 +3,7 @@
"company": "_Test Company",
"date_of_birth": "1980-01-01",
"date_of_joining": "2010-01-01",
"department": "_Test Department",
"department": "_Test Department - _TC",
"doctype": "Employee",
"employee_name": "_Test Employee",
"gender": "Female",
@ -15,7 +15,7 @@
"company": "_Test Company",
"date_of_birth": "1980-01-01",
"date_of_joining": "2010-01-01",
"department": "_Test Department 1",
"department": "_Test Department 1 - _TC",
"doctype": "Employee",
"employee_name": "_Test Employee 1",
"gender": "Male",
@ -27,7 +27,7 @@
"company": "_Test Company",
"date_of_birth": "1980-01-01",
"date_of_joining": "2010-01-01",
"department": "_Test Department 1",
"department": "_Test Department 1 - _TC",
"doctype": "Employee",
"employee_name": "_Test Employee 2",
"gender": "Male",

4
erpnext/hr/doctype/leave_application/test_leave_application.py
View File

@ -71,7 +71,7 @@ class TestLeaveApplication(unittest.TestCase):
add_role("test1@example.com", "Leave Approver")
clear_user_permissions_for_doctype("Employee")
frappe.db.set_value("Department", "_Test Department",
frappe.db.set_value("Department", "_Test Department - _TC",
"leave_block_list", "_Test Leave Block List")
make_allocation_record()
@ -214,7 +214,7 @@ class TestLeaveApplication(unittest.TestCase):
frappe.db.set_value("Leave Block List", "_Test Leave Block List",
"applies_to_all_departments", 1)
frappe.db.set_value("Employee", "_T-Employee-00002", "department",
"_Test Department")
"_Test Department - _TC")
frappe.set_user("test1@example.com")
application.insert()

6
erpnext/hr/doctype/leave_block_list/test_leave_block_list.py
View File

@ -14,20 +14,20 @@ class TestLeaveBlockList(unittest.TestCase):
def test_get_applicable_block_dates(self):
frappe.set_user("test@example.com")
frappe.db.set_value("Department", "_Test Department", "leave_block_list",
frappe.db.set_value("Department", "_Test Department - _TC", "leave_block_list",
"_Test Leave Block List")
self.assertTrue(getdate("2013-01-02") in
[d.block_date for d in get_applicable_block_dates("2013-01-01", "2013-01-03")])
def test_get_applicable_block_dates_for_allowed_user(self):
frappe.set_user("test1@example.com")
frappe.db.set_value("Department", "_Test Department 1", "leave_block_list",
frappe.db.set_value("Department", "_Test Department 1 - _TC", "leave_block_list",
"_Test Leave Block List")
self.assertEqual([], [d.block_date for d in get_applicable_block_dates("2013-01-01", "2013-01-03")])
def test_get_applicable_block_dates_all_lists(self):
frappe.set_user("test1@example.com")
frappe.db.set_value("Department", "_Test Department 1", "leave_block_list",
frappe.db.set_value("Department", "_Test Department 1 - _TC", "leave_block_list",
"_Test Leave Block List")
self.assertTrue(getdate("2013-01-02") in
[d.block_date for d in get_applicable_block_dates("2013-01-01", "2013-01-03", all_lists=True)])