nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Fix Tests, use project name instead of project_name field

Browse Source
This commit is contained in:
marination
2020-11-16 12:48:40 +05:30
parent 510b389838
commit d51c953c22
10 changed files with 73 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/projects/doctype/project/test_project.py
View File

@@ -47,6 +47,10 @@ def get_project(name):
def make_project(args):
args = frappe._dict(args)
if args.project_name and frappe.db.exists("Project", {"project_name": args.project_name}):
return frappe.get_doc("Project", {"project_name": args.project_name})
if args.project_template_name:
template = make_project_template(args.project_template_name)
else:

8
erpnext/projects/doctype/task/test_task.py
View File

@@ -30,14 +30,16 @@ class TestTask(unittest.TestCase):
})
def test_reschedule_dependent_task(self):
project = frappe.get_value("Project", {"project_name": "_Test Project"})
task1 = create_task("_Test Task 1", nowdate(), add_days(nowdate(), 10))
task2 = create_task("_Test Task 2", add_days(nowdate(), 11), add_days(nowdate(), 15), task1.name)
task2.get("depends_on")[0].project = "_Test Project"
task2.get("depends_on")[0].project = project
task2.save()
task3 = create_task("_Test Task 3", add_days(nowdate(), 11), add_days(nowdate(), 15), task2.name)
task3.get("depends_on")[0].project = "_Test Project"
task3.get("depends_on")[0].project = project
task3.save()
task1.update({
@@ -104,7 +106,7 @@ def create_task(subject, start=None, end=None, depends_on=None, project=None, sa
task.subject = subject
task.exp_start_date = start or nowdate()
task.exp_end_date = end or nowdate()
task.project = project or "_Test Project"
task.project = project or frappe.get_value("Project", {"project_name": "_Test Project"})
if save:
task.save()
else:

5
erpnext/projects/doctype/timesheet/test_timesheet.py
View File

@@ -89,10 +89,11 @@ class TestTimesheet(unittest.TestCase):
def test_timesheet_billing_based_on_project(self):
emp = make_employee("test_employee_6@salary.com")
project = frappe.get_value("Project", {"project_name": "_Test Project"})
timesheet = make_timesheet(emp, simulate=True, billable=1, project = '_Test Project', company='_Test Company')
timesheet = make_timesheet(emp, simulate=True, billable=1, project=project, company='_Test Company')
sales_invoice = create_sales_invoice(do_not_save=True)
sales_invoice.project = '_Test Project'
sales_invoice.project = project
sales_invoice.submit()
ts = frappe.get_doc('Timesheet', timesheet.name)