Skip to content

E
edx-platform
Commit 483a9a06 by Muhammad Shoaib Committed by Jonathan Piacenti
Options

muhhshoaib/adding_start_and_end_date_fields_to_course_objects_1302:added start… 

 muhhshoaib/adding_start_and_end_date_fields_to_course_objects_1302:added start and end date fields in course module

muhhshoaib/adding_start_and_end_date_fields_to_course_objects_1302: changes in the start and end dates
parent 2a5b0069
Showing with 17 additions and 2 deletions
lms/djangoapps/api_manager/courses/tests.py
# pylint: disable=E1103 # pylint: disable=E1103
""" """
Run these tests @ Devstack: Run these tests @ Devstack:
rake fasttest_lms[common/djangoapps/api_manager/courses/tests.py] rake fasttest_lms[common/djangoapps/api_manager/courses/tests.py]
...@@ -42,7 +41,10 @@ class CoursesApiTests(TestCase): ...@@ -42,7 +41,10 @@ class CoursesApiTests(TestCase):
self.base_users_uri = '/api/users' self.base_users_uri = '/api/users'
self.test_group_name = 'Alpha Group' self.test_group_name = 'Alpha Group'
self.course = CourseFactory.create() self.course = CourseFactory.create(
start="2014-06-16T14:30:00Z",
end="2015-01-16T14:30:00Z"
)
self.test_data = '<html>{}</html>'.format(str(uuid.uuid4())) self.test_data = '<html>{}</html>'.format(str(uuid.uuid4()))
self.chapter = ItemFactory.create( self.chapter = ItemFactory.create(
...@@ -175,6 +177,14 @@ class CoursesApiTests(TestCase): ...@@ -175,6 +177,14 @@ class CoursesApiTests(TestCase):
matched_course = True matched_course = True
self.assertTrue(matched_course) self.assertTrue(matched_course)
def test_course_detail_without_date_values(self):
create_course_with_out_date_values = CourseFactory.create() # pylint: disable=C0103
test_uri = self.base_courses_uri + '/' + create_course_with_out_date_values.id
response = self.do_get(test_uri)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.data['start'], create_course_with_out_date_values.start)
self.assertEqual(response.data['end'], create_course_with_out_date_values.end)
def test_courses_detail_get(self): def test_courses_detail_get(self):
test_uri = self.base_courses_uri + '/' + self.test_course_id test_uri = self.base_courses_uri + '/' + self.test_course_id
response = self.do_get(test_uri) response = self.do_get(test_uri)
...@@ -182,6 +192,8 @@ class CoursesApiTests(TestCase): ...@@ -182,6 +192,8 @@ class CoursesApiTests(TestCase):
self.assertGreater(len(response.data), 0) self.assertGreater(len(response.data), 0)
self.assertEqual(response.data['id'], self.test_course_id) self.assertEqual(response.data['id'], self.test_course_id)
self.assertEqual(response.data['name'], self.test_course_name) self.assertEqual(response.data['name'], self.test_course_name)
self.assertEqual(response.data['start'], self.course.start)
self.assertEqual(response.data['end'], self.course.end)
self.assertEqual(response.data['number'], self.test_course_number) self.assertEqual(response.data['number'], self.test_course_number)
self.assertEqual(response.data['org'], self.test_course_org) self.assertEqual(response.data['org'], self.test_course_org)
confirm_uri = self.test_server_prefix + test_uri confirm_uri = self.test_server_prefix + test_uri
......
lms/djangoapps/api_manager/courses/views.py
...@@ -99,6 +99,9 @@ def _serialize_content(request, course_id, content): ...@@ -99,6 +99,9 @@ def _serialize_content(request, course_id, content):
if hasattr(content, 'due'): if hasattr(content, 'due'):
data['due'] = content.due data['due'] = content.due
data['start'] = getattr(content, 'start', None)
data['end'] = getattr(content, 'end', None)
return data return data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment