From e3b7e1381d0fc3b3722bcd60f23981a834c869fe Mon Sep 17 00:00:00 2001 From: scmmishra Date: Thu, 14 Mar 2019 15:34:13 +0530 Subject: [PATCH] feat: Moved make_course_activity to test_course_activity.py --- .../course_activity/test_course_activity.py | 13 +++++++++++++ .../course_enrollment/test_course_enrollment.py | 16 ++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/erpnext/education/doctype/course_activity/test_course_activity.py b/erpnext/education/doctype/course_activity/test_course_activity.py index 6745a4f5330..5269a6b71a3 100644 --- a/erpnext/education/doctype/course_activity/test_course_activity.py +++ b/erpnext/education/doctype/course_activity/test_course_activity.py @@ -9,3 +9,16 @@ import unittest class TestCourseActivity(unittest.TestCase): pass +def make_course_activity(enrollment, content_type, content): + activity = frappe.get_all("Course Activity", filters={'enrollment': enrollment, 'content_type': content_type, 'content': content}) + try: + activity = frappe.get_doc("Course Activity", activity[0]['name']) + except (IndexError, frappe.DoesNotExistError): + activity = frappe.get_doc({ + "doctype": "Course Activity", + "enrollment": enrollment, + "content_type": content_type, + "content": content, + "activity_date": frappe.utils.datetime.datetime.now() + }).insert() + return activity diff --git a/erpnext/education/doctype/course_enrollment/test_course_enrollment.py b/erpnext/education/doctype/course_enrollment/test_course_enrollment.py index 3ebf0b97bfc..5ecace2a603 100644 --- a/erpnext/education/doctype/course_enrollment/test_course_enrollment.py +++ b/erpnext/education/doctype/course_enrollment/test_course_enrollment.py @@ -9,8 +9,8 @@ import unittest from erpnext.education.doctype.student.test_student import create_student from erpnext.education.doctype.student.test_student import get_student - from erpnext.education.doctype.program.test_program import setup_program +from erpnext.education.doctype.course_activity.test_course_activity import make_course_activity class TestCourseEnrollment(unittest.TestCase): def setUp(self): @@ -31,16 +31,4 @@ class TestCourseEnrollment(unittest.TestCase): frappe.db.rollback() -def make_course_activity(enrollment, content_type, content): - activity = frappe.get_all("Course Activity", filters={'enrollment': enrollment, 'content_type': content_type, 'content': content}) - try: - activity = frappe.get_doc("Course Activity", activity[0]['name']) - except (IndexError, frappe.DoesNotExistError): - activity = frappe.get_doc({ - "doctype": "Course Activity", - "enrollment": enrollment, - "content_type": content_type, - "content": content, - "activity_date": frappe.utils.datetime.datetime.now() - }).insert() - return activity +