6eead791a1
I wanted to make a byte-sized contribution but there were no Jira tickets so we decided, thanks to a conversation with @jmbowman through the Open Edx Community #incr (Slack) channel, to collaborate in the elimination of warnings listed in the Warnings Report at https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/ This PR contributes to the elimination of deprecation warnings, specifically the one mentioned above and reported in the Warnings Report. Changed assertNotRegexpMatches to assertNotRegex in the following files: cms/djangoapps/contentstore/views/tests/test_preview.py cms/djangoapps/contentstore/views/tests/test_item.py lms/djangoapps/commerce/tests/test_views.py lms/djangoapps/dashboard/tests/test_sysadmin.py This warning occurs due to deprecation in python 3.5: https://docs.python.org/3.5/library/unittest.html#unittest.TestCase.assertNotRegex
208 lines
7.3 KiB
Python
208 lines
7.3 KiB
Python
"""
|
|
Tests for contentstore.views.preview.py
|
|
"""
|
|
|
|
|
|
import re
|
|
|
|
import ddt
|
|
import mock
|
|
import six
|
|
from django.test.client import Client, RequestFactory
|
|
from xblock.core import XBlock, XBlockAside
|
|
|
|
from contentstore.utils import reverse_usage_url
|
|
from contentstore.views.preview import _preview_module_system, get_preview_fragment
|
|
from student.tests.factories import UserFactory
|
|
from xblock_config.models import StudioConfig
|
|
from xmodule.modulestore import ModuleStoreEnum
|
|
from xmodule.modulestore.django import modulestore
|
|
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
|
|
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
|
|
from xmodule.modulestore.tests.test_asides import AsideTestType
|
|
|
|
|
|
@ddt.ddt
|
|
class GetPreviewHtmlTestCase(ModuleStoreTestCase):
|
|
"""
|
|
Tests for get_preview_fragment.
|
|
|
|
Note that there are other existing test cases in test_contentstore that indirectly execute
|
|
get_preview_fragment via the xblock RESTful API.
|
|
"""
|
|
@XBlockAside.register_temp_plugin(AsideTestType, 'test_aside')
|
|
def test_preview_fragment(self):
|
|
"""
|
|
Test for calling get_preview_html. Ensures data-usage-id is correctly set and
|
|
asides are correctly included.
|
|
"""
|
|
course = CourseFactory.create(default_store=ModuleStoreEnum.Type.split)
|
|
html = ItemFactory.create(
|
|
parent_location=course.location,
|
|
category="html",
|
|
data={'data': "<html>foobar</html>"}
|
|
)
|
|
|
|
config = StudioConfig.current()
|
|
config.enabled = True
|
|
config.save()
|
|
|
|
request = RequestFactory().get('/dummy-url')
|
|
request.user = UserFactory()
|
|
request.session = {}
|
|
|
|
# Call get_preview_fragment directly.
|
|
context = {
|
|
'reorderable_items': set(),
|
|
'read_only': True
|
|
}
|
|
html = get_preview_fragment(request, html, context).content
|
|
|
|
# Verify student view html is returned, and the usage ID is as expected.
|
|
html_pattern = re.escape(
|
|
six.text_type(course.id.make_usage_key('html', 'replaceme'))
|
|
).replace('replaceme', r'html_[0-9]*')
|
|
self.assertRegex(
|
|
html,
|
|
'data-usage-id="{}"'.format(html_pattern)
|
|
)
|
|
self.assertRegex(html, '<html>foobar</html>')
|
|
self.assertRegex(html, r"data-block-type=[\"\']test_aside[\"\']")
|
|
self.assertRegex(html, "Aside rendered")
|
|
# Now ensure the acid_aside is not in the result
|
|
self.assertNotRegex(html, r"data-block-type=[\"\']acid_aside[\"\']")
|
|
|
|
# Ensure about pages don't have asides
|
|
about = modulestore().get_item(course.id.make_usage_key('about', 'overview'))
|
|
html = get_preview_fragment(request, about, context).content
|
|
self.assertNotRegex(html, r"data-block-type=[\"\']test_aside[\"\']")
|
|
self.assertNotRegex(html, "Aside rendered")
|
|
|
|
@XBlockAside.register_temp_plugin(AsideTestType, 'test_aside')
|
|
def test_preview_no_asides(self):
|
|
"""
|
|
Test for calling get_preview_html. Ensures data-usage-id is correctly set and
|
|
asides are correctly excluded because they are not enabled.
|
|
"""
|
|
course = CourseFactory.create(default_store=ModuleStoreEnum.Type.split)
|
|
html = ItemFactory.create(
|
|
parent_location=course.location,
|
|
category="html",
|
|
data={'data': "<html>foobar</html>"}
|
|
)
|
|
|
|
config = StudioConfig.current()
|
|
config.enabled = False
|
|
config.save()
|
|
|
|
request = RequestFactory().get('/dummy-url')
|
|
request.user = UserFactory()
|
|
request.session = {}
|
|
|
|
# Call get_preview_fragment directly.
|
|
context = {
|
|
'reorderable_items': set(),
|
|
'read_only': True
|
|
}
|
|
html = get_preview_fragment(request, html, context).content
|
|
|
|
self.assertNotRegex(html, r"data-block-type=[\"\']test_aside[\"\']")
|
|
self.assertNotRegex(html, "Aside rendered")
|
|
|
|
@mock.patch('xmodule.conditional_module.ConditionalModule.is_condition_satisfied')
|
|
def test_preview_conditional_module_children_context(self, mock_is_condition_satisfied):
|
|
"""
|
|
Testst that when empty context is pass to children of ConditionalModule it will not raise KeyError.
|
|
"""
|
|
mock_is_condition_satisfied.return_value = True
|
|
client = Client()
|
|
client.login(username=self.user.username, password=self.user_password)
|
|
|
|
with self.store.default_store(ModuleStoreEnum.Type.split):
|
|
course = CourseFactory.create()
|
|
|
|
conditional_block = ItemFactory.create(
|
|
parent_location=course.location,
|
|
category="conditional"
|
|
)
|
|
|
|
# child conditional_block
|
|
ItemFactory.create(
|
|
parent_location=conditional_block.location,
|
|
category="conditional"
|
|
)
|
|
|
|
url = reverse_usage_url(
|
|
'preview_handler',
|
|
conditional_block.location,
|
|
kwargs={'handler': 'xmodule_handler/conditional_get'}
|
|
)
|
|
response = client.post(url)
|
|
self.assertEqual(response.status_code, 200)
|
|
|
|
@ddt.data(ModuleStoreEnum.Type.split, ModuleStoreEnum.Type.mongo)
|
|
def test_block_branch_not_changed_by_preview_handler(self, default_store):
|
|
"""
|
|
Tests preview_handler should not update blocks being previewed
|
|
"""
|
|
client = Client()
|
|
client.login(username=self.user.username, password=self.user_password)
|
|
|
|
with self.store.default_store(default_store):
|
|
course = CourseFactory.create()
|
|
|
|
block = ItemFactory.create(
|
|
parent_location=course.location,
|
|
category="problem"
|
|
)
|
|
|
|
url = reverse_usage_url(
|
|
'preview_handler',
|
|
block.location,
|
|
kwargs={'handler': 'xmodule_handler/problem_check'}
|
|
)
|
|
response = client.post(url)
|
|
self.assertEqual(response.status_code, 200)
|
|
self.assertFalse(modulestore().has_changes(modulestore().get_item(block.location)))
|
|
|
|
|
|
@XBlock.needs("field-data")
|
|
@XBlock.needs("i18n")
|
|
@XBlock.needs("user")
|
|
class PureXBlock(XBlock):
|
|
"""
|
|
Pure XBlock to use in tests.
|
|
"""
|
|
pass
|
|
|
|
|
|
@ddt.ddt
|
|
class StudioXBlockServiceBindingTest(ModuleStoreTestCase):
|
|
"""
|
|
Tests that the Studio Module System (XBlock Runtime) provides an expected set of services.
|
|
"""
|
|
def setUp(self):
|
|
"""
|
|
Set up the user and request that will be used.
|
|
"""
|
|
super(StudioXBlockServiceBindingTest, self).setUp()
|
|
self.user = UserFactory()
|
|
self.course = CourseFactory.create()
|
|
self.request = mock.Mock()
|
|
self.field_data = mock.Mock()
|
|
|
|
@XBlock.register_temp_plugin(PureXBlock, identifier='pure')
|
|
@ddt.data("user", "i18n", "field-data")
|
|
def test_expected_services_exist(self, expected_service):
|
|
"""
|
|
Tests that the 'user' and 'i18n' services are provided by the Studio runtime.
|
|
"""
|
|
descriptor = ItemFactory(category="pure", parent=self.course)
|
|
runtime = _preview_module_system(
|
|
self.request,
|
|
descriptor,
|
|
self.field_data,
|
|
)
|
|
service = runtime.service(descriptor, expected_service)
|
|
self.assertIsNotNone(service)
|