Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions cms/djangoapps/contentstore/tests/test_contentstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
import json
import shutil
import mock

from textwrap import dedent

from django.test.client import Client
from django.test.utils import override_settings
from django.conf import settings
Expand Down Expand Up @@ -312,7 +315,14 @@ def test_no_static_link_rewrites_on_import(self):
handouts = module_store.get_item(Location(['i4x', 'edX', 'toy', 'html', 'toyhtml', None]))
self.assertIn('/static/', handouts.data)

def test_import_textbook_as_content_element(self):
@mock.patch('xmodule.course_module.requests.get')
def test_import_textbook_as_content_element(self, mock_get):
mock_get.return_value.text = dedent("""
<?xml version="1.0"?><table_of_contents>
<entry page="5" page_label="ii" name="Table of Contents"/>
</table_of_contents>
""").strip()

module_store = modulestore('direct')
import_from_xml(module_store, 'common/test/data/', ['toy'])

Expand Down Expand Up @@ -845,7 +855,14 @@ def verify_content_existence(self, store, root_dir, location, dirname, category_
filesystem = OSFS(root_dir / ('test_export/' + dirname))
self.assertTrue(filesystem.exists(item.location.name + filename_suffix))

def test_export_course(self):
@mock.patch('xmodule.course_module.requests.get')
def test_export_course(self, mock_get):
mock_get.return_value.text = dedent("""
<?xml version="1.0"?><table_of_contents>
<entry page="5" page_label="ii" name="Table of Contents"/>
</table_of_contents>
""").strip()

module_store = modulestore('direct')
draft_store = modulestore('draft')
content_store = contentstore()
Expand Down
13 changes: 10 additions & 3 deletions lms/djangoapps/courseware/tests/tests.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
"""
Test for LMS courseware app.
"""
import mock
from django.core.urlresolvers import reverse
from django.test.utils import override_settings

from textwrap import dedent

from xmodule.error_module import ErrorDescriptor
from xmodule.modulestore.django import modulestore
from xmodule.modulestore import Location
Expand Down Expand Up @@ -156,10 +159,14 @@ def setUp(self):
self.store = modulestore()
import_from_xml(self.store, TEST_DATA_DIR, ['toy'])

def test_toy_course_loads(self):
self.check_all_pages_load('edX/toy/2012_Fall')
@mock.patch('xmodule.course_module.requests.get')
def test_toy_textbooks_loads(self, mock_get):
mock_get.return_value.text = dedent("""
<?xml version="1.0"?><table_of_contents>
<entry page="5" page_label="ii" name="Table of Contents"/>
</table_of_contents>
""").strip()

def test_toy_textbooks_loads(self):
location = Location(['i4x', 'edX', 'toy', 'course', '2012_Fall', None])
course = self.store.get_item(location)
self.assertGreater(len(course.textbooks), 0)
Expand Down