Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Moved make_course_activity to test_course_activity.py

Browse Source
This commit is contained in:
scmmishra 2019-03-14 15:34:13 +05:30
parent 8aa6ac7b03
commit e3b7e1381d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/education/doctype/course_activity/test_course_activity.py
View File

@ -9,3 +9,16 @@ import unittest
class TestCourseActivity(unittest.TestCase): class TestCourseActivity(unittest.TestCase):
pass 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

16
erpnext/education/doctype/course_enrollment/test_course_enrollment.py
View File

@ -9,8 +9,8 @@ import unittest
from erpnext.education.doctype.student.test_student import create_student from erpnext.education.doctype.student.test_student import create_student
from erpnext.education.doctype.student.test_student import get_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.program.test_program import setup_program
from erpnext.education.doctype.course_activity.test_course_activity import make_course_activity
class TestCourseEnrollment(unittest.TestCase): class TestCourseEnrollment(unittest.TestCase):
def setUp(self): def setUp(self):
@ -31,16 +31,4 @@ class TestCourseEnrollment(unittest.TestCase):
frappe.db.rollback() 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