Merge pull request #26656 from ankush/fix_dn_test
test: fix test due to rename change
diff --git a/erpnext/assets/doctype/asset_movement/test_asset_movement.py b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
index cddee5f..2b2d2b4 100644
--- a/erpnext/assets/doctype/asset_movement/test_asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
@@ -15,6 +15,7 @@
class TestAssetMovement(unittest.TestCase):
def setUp(self):
+ frappe.db.set_value("Company", "_Test Company", "capital_work_in_progress_account", "CWIP Account - _TC")
create_asset_data()
make_location()
@@ -45,12 +46,12 @@
'location_name': 'Test Location 2'
}).insert()
- movement1 = create_asset_movement(purpose = 'Transfer', company = asset.company,
+ movement1 = create_asset_movement(purpose = 'Transfer', company = asset.company,
assets = [{ 'asset': asset.name , 'source_location': 'Test Location', 'target_location': 'Test Location 2'}],
reference_doctype = 'Purchase Receipt', reference_name = pr.name)
self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location 2")
- movement2 = create_asset_movement(purpose = 'Transfer', company = asset.company,
+ create_asset_movement(purpose = 'Transfer', company = asset.company,
assets = [{ 'asset': asset.name , 'source_location': 'Test Location 2', 'target_location': 'Test Location'}],
reference_doctype = 'Purchase Receipt', reference_name = pr.name)
self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location")
@@ -59,18 +60,18 @@
self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location")
employee = make_employee("testassetmovemp@example.com", company="_Test Company")
- movement3 = create_asset_movement(purpose = 'Issue', company = asset.company,
+ create_asset_movement(purpose = 'Issue', company = asset.company,
assets = [{ 'asset': asset.name , 'source_location': 'Test Location', 'to_employee': employee}],
reference_doctype = 'Purchase Receipt', reference_name = pr.name)
-
+
# after issuing asset should belong to an employee not at a location
self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), None)
self.assertEqual(frappe.db.get_value("Asset", asset.name, "custodian"), employee)
-
+
def test_last_movement_cancellation(self):
pr = make_purchase_receipt(item_code="Macbook Pro",
qty=1, rate=100000.0, location="Test Location")
-
+
asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name')
asset = frappe.get_doc('Asset', asset_name)
asset.calculate_depreciation = 1
@@ -85,17 +86,17 @@
})
if asset.docstatus == 0:
asset.submit()
-
+
if not frappe.db.exists("Location", "Test Location 2"):
frappe.get_doc({
'doctype': 'Location',
'location_name': 'Test Location 2'
}).insert()
-
+
movement = frappe.get_doc({'doctype': 'Asset Movement', 'reference_name': pr.name })
self.assertRaises(frappe.ValidationError, movement.cancel)
- movement1 = create_asset_movement(purpose = 'Transfer', company = asset.company,
+ movement1 = create_asset_movement(purpose = 'Transfer', company = asset.company,
assets = [{ 'asset': asset.name , 'source_location': 'Test Location', 'target_location': 'Test Location 2'}],
reference_doctype = 'Purchase Receipt', reference_name = pr.name)
self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location 2")
diff --git a/erpnext/hr/doctype/attendance_request/test_attendance_request.py b/erpnext/hr/doctype/attendance_request/test_attendance_request.py
index 3c42bd9..9e668aa 100644
--- a/erpnext/hr/doctype/attendance_request/test_attendance_request.py
+++ b/erpnext/hr/doctype/attendance_request/test_attendance_request.py
@@ -15,7 +15,11 @@
for doctype in ["Attendance Request", "Attendance"]:
frappe.db.sql("delete from `tab{doctype}`".format(doctype=doctype))
+ def tearDown(self):
+ frappe.db.rollback()
+
def test_on_duty_attendance_request(self):
+ "Test creation/updation of Attendace from Attendance Request, on duty."
today = nowdate()
employee = get_employee()
attendance_request = frappe.new_doc("Attendance Request")
@@ -26,17 +30,36 @@
attendance_request.company = "_Test Company"
attendance_request.insert()
attendance_request.submit()
- attendance = frappe.get_doc('Attendance', {
- 'employee': employee.name,
- 'attendance_date': date(date.today().year, 1, 1),
- 'docstatus': 1
- })
- self.assertEqual(attendance.status, 'Present')
+
+ attendance = frappe.db.get_value(
+ "Attendance",
+ filters={
+ "attendance_request": attendance_request.name,
+ "attendance_date": date(date.today().year, 1, 1)
+ },
+ fieldname=["status", "docstatus"],
+ as_dict=True
+ )
+ self.assertEqual(attendance.status, "Present")
+ self.assertEqual(attendance.docstatus, 1)
+
+ # cancelling attendance request cancels linked attendances
attendance_request.cancel()
- attendance.reload()
- self.assertEqual(attendance.docstatus, 2)
+
+ # cancellation alters docname
+ # fetch attendance value again to avoid stale docname
+ attendance_docstatus = frappe.db.get_value(
+ "Attendance",
+ filters={
+ "attendance_request": attendance_request.name,
+ "attendance_date": date(date.today().year, 1, 1)
+ },
+ fieldname="docstatus"
+ )
+ self.assertEqual(attendance_docstatus, 2)
def test_work_from_home_attendance_request(self):
+ "Test creation/updation of Attendace from Attendance Request, work from home."
today = nowdate()
employee = get_employee()
attendance_request = frappe.new_doc("Attendance Request")
@@ -47,15 +70,30 @@
attendance_request.company = "_Test Company"
attendance_request.insert()
attendance_request.submit()
- attendance = frappe.get_doc('Attendance', {
- 'employee': employee.name,
- 'attendance_date': date(date.today().year, 1, 1),
- 'docstatus': 1
- })
- self.assertEqual(attendance.status, 'Work From Home')
+
+ attendance_status = frappe.db.get_value(
+ "Attendance",
+ filters={
+ "attendance_request": attendance_request.name,
+ "attendance_date": date(date.today().year, 1, 1)
+ },
+ fieldname="status"
+ )
+ self.assertEqual(attendance_status, 'Work From Home')
+
attendance_request.cancel()
- attendance.reload()
- self.assertEqual(attendance.docstatus, 2)
+
+ # cancellation alters docname
+ # fetch attendance value again to avoid stale docname
+ attendance_docstatus = frappe.db.get_value(
+ "Attendance",
+ filters={
+ "attendance_request": attendance_request.name,
+ "attendance_date": date(date.today().year, 1, 1)
+ },
+ fieldname="docstatus"
+ )
+ self.assertEqual(attendance_docstatus, 2)
def get_employee():
return frappe.get_doc("Employee", "_T-Employee-00001")
diff --git a/erpnext/hr/doctype/shift_request/test_shift_request.py b/erpnext/hr/doctype/shift_request/test_shift_request.py
index 9c0d8e3..3525540 100644
--- a/erpnext/hr/doctype/shift_request/test_shift_request.py
+++ b/erpnext/hr/doctype/shift_request/test_shift_request.py
@@ -15,24 +15,35 @@
for doctype in ["Shift Request", "Shift Assignment"]:
frappe.db.sql("delete from `tab{doctype}`".format(doctype=doctype))
+ def tearDown(self):
+ frappe.db.rollback()
+
def test_make_shift_request(self):
+ "Test creation/updation of Shift Assignment from Shift Request."
department = frappe.get_value("Employee", "_T-Employee-00001", 'department')
set_shift_approver(department)
approver = frappe.db.sql("""select approver from `tabDepartment Approver` where parent= %s and parentfield = 'shift_request_approver'""", (department))[0][0]
shift_request = make_shift_request(approver)
- shift_assignments = frappe.db.sql('''
- SELECT shift_request, employee
- FROM `tabShift Assignment`
- WHERE shift_request = '{0}'
- '''.format(shift_request.name), as_dict=1)
- for d in shift_assignments:
- employee = d.get('employee')
- self.assertEqual(shift_request.employee, employee)
- shift_request.cancel()
- shift_assignment_doc = frappe.get_doc("Shift Assignment", {"shift_request": d.get('shift_request')})
- self.assertEqual(shift_assignment_doc.docstatus, 2)
+ # Only one shift assignment is created against a shift request
+ shift_assignment = frappe.db.get_value(
+ "Shift Assignment",
+ filters={"shift_request": shift_request.name},
+ fieldname=["employee", "docstatus"],
+ as_dict=True
+ )
+ self.assertEqual(shift_request.employee, shift_assignment.employee)
+ self.assertEqual(shift_assignment.docstatus, 1)
+
+ shift_request.cancel()
+
+ shift_assignment_docstatus = frappe.db.get_value(
+ "Shift Assignment",
+ filters={"shift_request": shift_request.name},
+ fieldname="docstatus"
+ )
+ self.assertEqual(shift_assignment_docstatus, 2)
def test_shift_request_approver_perms(self):
employee = frappe.get_doc("Employee", "_T-Employee-00001")
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 974648d..1de1e00 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -673,6 +673,8 @@
so.cancel()
+ dn.load_from_db()
+
self.assertRaises(frappe.CancelledLinkError, dn.submit)
def test_service_type_product_bundle(self):