Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: leave test cases #1758

Merged
merged 4 commits into from
Oct 8, 2021
Merged

fix: leave test cases #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbe537b
ix: fixed the test cases for HR module
nehasacher143 Oct 8, 2021
f594ace
fix: fixed the leave test cases
nehasacher143 Oct 8, 2021
bd9024e
fix: fixed the shift type test case
nehasacher143 Oct 8, 2021
2eaad7c
Update erpnext/hr/doctype/shift_type/test_shift_type.py
sahil28297 Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions erpnext/hr/doctype/salary_structure/test_salary_structure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ def make_salary_structure(salary_structure, payroll_frequency, employee=None, do
"doctype": "Salary Structure",
"name": salary_structure,
"company": erpnext.get_default_company(),
"earnings": make_earning_salary_component(test_tax=test_tax),
"deductions": make_deduction_salary_component(test_tax=test_tax),
"earnings": make_earning_salary_component(setup=True, test_tax=test_tax),
"deductions": make_deduction_salary_component(setup=True, test_tax=test_tax),
"payroll_frequency": payroll_frequency,
"payment_account": get_random("Account")
}
Expand Down
4 changes: 3 additions & 1 deletion erpnext/hr/doctype/shift_assignment/test_shift_assignment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import frappe
import unittest
from erpnext.hr.doctype.shift_type.test_shift_type import create_shift_type
from frappe.utils import nowdate

test_dependencies = ["Shift Type"]
Expand All @@ -15,9 +16,10 @@ def setUp(self):
frappe.db.sql("delete from `tabShift Assignment`")

def test_make_shift_assignment(self):
shift = create_shift_type()
shift_assignment = frappe.get_doc({
"doctype": "Shift Assignment",
"shift_type": "Day Shift",
"shift_type": shift,
"company": "_Test Company",
"employee": "_T-Employee-00001",
"date": nowdate()
Expand Down
4 changes: 3 additions & 1 deletion erpnext/hr/doctype/shift_request/test_shift_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import frappe
import unittest
from erpnext.hr.doctype.shift_type.test_shift_type import create_shift_type
from frappe.utils import nowdate

class TestShiftRequest(unittest.TestCase):
Expand All @@ -13,9 +14,10 @@ def setUp(self):
frappe.db.sql("delete from `tab{doctype}`".format(doctype=doctype))

def test_make_shift_request(self):
shift = create_shift_type()
shift_request = frappe.get_doc({
"doctype": "Shift Request",
"shift_type": "Day Shift",
"shift_type": shift,
"company": "_Test Company",
"employee": "_T-Employee-00001",
"employee_name": "_Test Employee",
Expand Down
27 changes: 17 additions & 10 deletions erpnext/hr/doctype/shift_type/test_shift_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@

class TestShiftType(unittest.TestCase):
def test_make_shift_type(self):
if frappe.db.exists("Shift Type", "Day Shift"):
return
shift_type = frappe.get_doc({
"doctype": "Shift Type",
"name": "Day Shift",
"start_time": "9:00:00",
"end_time": "18:00:00"
})
shift_type.insert()

self.assertEqual(create_shift_type(), "Day Shift")


def create_shift_type():
shift = frappe.db.exists("Shift Type", "Day Shift")
if shift:
return shift

shift_type = frappe.get_doc({
"doctype": "Shift Type",
"name": "Day Shift",
"start_time": "9:00:00",
"end_time": "18:00:00"
})
shift_type.insert()
return shift_type.name