diff --git a/erpnext/support/doctype/issue_priority/test_issue_priority.py b/erpnext/support/doctype/issue_priority/test_issue_priority.py index c183bbc82c7..0d65122c0db 100644 --- a/erpnext/support/doctype/issue_priority/test_issue_priority.py +++ b/erpnext/support/doctype/issue_priority/test_issue_priority.py @@ -15,8 +15,8 @@ def make_priorities(): insert_priority("High") def insert_priority(name): - frappe.get_doc({ - "doctype": "Issue Priority", - "name": name, - "default_priority": 1 if name == "Medium" else 0 - }).insert(ignore_permissions=True) \ No newline at end of file + if not frappe.db.exists("Issue Priority", name): + frappe.get_doc({ + "doctype": "Issue Priority", + "name": name + }).insert(ignore_permissions=True) \ No newline at end of file diff --git a/erpnext/support/doctype/service_level/test_service_level.py b/erpnext/support/doctype/service_level/test_service_level.py index deba197f4e1..79f064358db 100644 --- a/erpnext/support/doctype/service_level/test_service_level.py +++ b/erpnext/support/doctype/service_level/test_service_level.py @@ -12,7 +12,14 @@ import frappe import unittest class TestServiceLevel(unittest.TestCase): - pass + + def test_service_level(self): + test_make_service_level = make_service_level() + get_make_service_level = get_service_level() + + self.assertEqual(test_make_service_level.name, get_make_service_level.name) + self.assertEqual(test_make_service_level.holiday_list, get_make_service_level.holiday_list) + self.assertEqual(test_make_service_level.employee_group, get_make_service_level.employee_group) def make_service_level(): employee_group = make_employee_group() @@ -36,6 +43,7 @@ def make_service_level(): { "priority": "Medium", "response_time": 4, + "default_priority": 1, "response_time_period": "Hour", "resolution_time": 6, "resolution_time_period": "Hour", @@ -107,6 +115,7 @@ def make_service_level(): { "priority": "Medium", "response_time": 2, + "default_priority": 1, "response_time_period": "Day", "resolution_time": 3, "resolution_time_period": "Day", @@ -157,16 +166,16 @@ def make_service_level(): } ] }) - service_level_exist = frappe.db.exists("Service Level", "_Test Service Level") + service_level_exist = frappe.get_doc("Service Level", "_Test Service Level") + if not service_level_exist: service_level.insert() - return service_level.service_level + return service_level else: return service_level_exist def get_service_level(): - service_level = frappe.db.exists("Service Level", "_Test Service Level") - return service_level + return frappe.get_doc("Service Level", "_Test Service Level") def make_holiday_list(): holiday_list = frappe.db.exists("Holiday List", "__Test Holiday List") diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py index d1d040722fb..3368aff613b 100644 --- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py +++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py @@ -20,7 +20,7 @@ class ServiceLevelAgreement(Document): if not self.ignore_start_and_end_date and self.start_date >= self.end_date: frappe.throw(_("Start Date of Agreement can't be greater than or equal to End Date.")) - if not self.ignore_start_and_end_date and self.end_date < frappe.utils.today(): + if not self.ignore_start_and_end_date and self.end_date < frappe.utils.getdate(): frappe.throw(_("End Date of Agreement can't be less than today.")) def get_service_level_agreement_priority(self, priority): @@ -64,6 +64,6 @@ def get_active_service_level_agreement_for(priority, customer=None, service_leve or_filters.append(["Service Level Agreement", "default_service_level_agreement", "=", 1]) agreement = frappe.get_list("Service Level Agreement", filters=filters, or_filters=or_filters, - fields=["name", "default_priority", "customer"], debug=True) + fields=["name", "default_priority", "customer"]) return agreement[0] if agreement else None \ No newline at end of file diff --git a/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py index 5ad907a4492..2411d2163ae 100644 --- a/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py +++ b/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py @@ -8,7 +8,14 @@ import unittest from erpnext.support.doctype.service_level.test_service_level import make_service_level class TestServiceLevelAgreement(unittest.TestCase): - pass + + def test_service_level_agreement(self): + test_make_service_level_agreement = make_service_level_agreement() + test_get_service_level_agreement = get_service_level_agreement() + + self.assertEqual(test_make_service_level_agreement.name, test_get_service_level_agreement.name) + self.assertEqual(test_make_service_level_agreement.customer, test_get_service_level_agreement.customer) + self.assertEqual(test_make_service_level_agreement.default_service_level_agreement, test_get_service_level_agreement.default_service_level_agreement) def make_service_level_agreement(): make_service_level() @@ -34,6 +41,7 @@ def make_service_level_agreement(): { "priority": "Medium", "response_time": 4, + "default_priority": 1, "response_time_period": "Hour", "resolution_time": 6, "resolution_time_period": "Hour", @@ -172,13 +180,14 @@ def make_service_level_agreement(): ] }) - service_level_agreement_exists = frappe.db.exists("Service Level Agreement", "SLA-_Test Service Level Agreement") + service_level_agreement_exists = frappe.get_doc("Service Level Agreement", "SLA-_Test Service Level Agreement") + if not service_level_agreement_exists: service_level_agreement.insert(ignore_permissions=True) - return service_level_agreement.name + return service_level_agreement else: return service_level_agreement_exists def get_service_level_agreement(): - service_level_agreement = frappe.db.exists("Service Level Agreement", "SLA-_Test Service Level Agreement") + service_level_agreement = frappe.get_doc("Service Level Agreement", "SLA-_Test Service Level Agreement") return service_level_agreement \ No newline at end of file