Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add additional JavaScript context tags

Browse Source
This commit is contained in:
Robert Raposa
2016-04-26 03:09:09 -04:00
parent a61707b8e6
commit b67c133910
2 changed files with 78 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
scripts/tests/test_safe_template_linter.py
View File

@@ -448,9 +448,38 @@ class TestMakoTemplateLinter(TestLinter):
mako_template = textwrap.dedent("""
<%page expression_filter="h"/>
## switch to JavaScript context
<script>
{expression}
</script>
## switch back to HTML context
${{x}}
""".format(expression=data['expression']))
linter._check_mako_file_is_safe(mako_template, results)
self._validate_data_rules(data, results)
@data(
{'expression': '${x}', 'rule': Rules.mako_invalid_js_filter},
{'expression': '"${x | n, js_escaped_string}"', 'rule': None},
)
def test_check_mako_expressions_in_require_module(self, data):
"""
Test _check_mako_file_is_safe in JavaScript require context provides
appropriate violations
"""
linter = MakoTemplateLinter()
results = FileResults('')
mako_template = textwrap.dedent("""
<%page expression_filter="h"/>
## switch to JavaScript context (after next line)
<%static:require_module module_name="${{x}}" class_name="TestFactory">
{expression}
</%static:require_module>
## switch back to HTML context
${{x}}
""".format(expression=data['expression']))
linter._check_mako_file_is_safe(mako_template, results)
@@ -463,7 +492,7 @@ class TestMakoTemplateLinter(TestLinter):
)
def test_check_mako_expressions_in_require_js(self, data):
"""
Test _check_mako_file_is_safe in JavaScript require context provides
Test _check_mako_file_is_safe in JavaScript require js context provides
appropriate violations
"""
linter = MakoTemplateLinter()
@@ -471,9 +500,12 @@ class TestMakoTemplateLinter(TestLinter):
mako_template = textwrap.dedent("""
<%page expression_filter="h"/>
<%static:require_module module_name="${{x}}" class_name="TestFactory">
# switch to JavaScript context
<%block name="requirejs">
{expression}
</%static:require_module>
</%block>
## switch back to HTML context
${{x}}
""".format(expression=data['expression']))
linter._check_mako_file_is_safe(mako_template, results)
@@ -481,12 +513,14 @@ class TestMakoTemplateLinter(TestLinter):
self._validate_data_rules(data, results)
@data(
{'media_type': 'text/javascript', 'expected_violations': 0},
{'media_type': 'text/ecmascript', 'expected_violations': 0},
{'media_type': 'application/ecmascript', 'expected_violations': 0},
{'media_type': 'application/javascript', 'expected_violations': 0},
{'media_type': 'text/template', 'expected_violations': 1},
{'media_type': 'unknown/type', 'expected_violations': 1},
{'media_type': 'text/javascript', 'rule': None},
{'media_type': 'text/ecmascript', 'rule': None},
{'media_type': 'application/ecmascript', 'rule': None},
{'media_type': 'application/javascript', 'rule': None},
{'media_type': 'text/x-mathjax-config', 'rule': None},
{'media_type': 'json/xblock-args', 'rule': None},
{'media_type': 'text/template', 'rule': Rules.mako_invalid_html_filter},
{'media_type': 'unknown/type', 'rule': Rules.mako_unknown_context},
)
def test_check_mako_expressions_in_script_type(self, data):
"""
@@ -497,14 +531,17 @@ class TestMakoTemplateLinter(TestLinter):
mako_template = textwrap.dedent("""
<%page expression_filter="h"/>
# switch to JavaScript context
<script type="{}">
${{x | n, dump_js_escaped_json}}
</script>
## switch back to HTML context
${{x}}
""").format(data['media_type'])
linter._check_mako_file_is_safe(mako_template, results)
self.assertEqual(len(results.violations), data['expected_violations'])
self._validate_data_rules(data, results)
def test_check_mako_expressions_in_mixed_contexts(self):
"""