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

Merge branch 'master' into tests/diana/update-oe-unit-tests

Browse Source
This commit is contained in:
Diana Huang
2013-01-29 16:44:15 -05:00
parent 585f1c41d6 3669ea5c97
commit f7424eb8d6
25 changed files with 853 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/lib/xmodule/jasmine_test_runner.html.erb
View File

@@ -17,6 +17,7 @@
<script type="text/javascript" src="<%= common_js_root %>/vendor/mathjax-MathJax-c9db6ac/MathJax.js"></script>
<script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/jquery.tinymce.js"></script>
<script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript" src="<%= common_js_root %>/vendor/RequireJS.js"></script>
<script type="text/javascript">
AjaxPrefix.addAjaxPrefix(jQuery, function() {

15
common/lib/xmodule/xmodule/modulestore/xml_importer.py
View File

@@ -247,7 +247,7 @@ def remap_namespace(module, target_location_namespace):
return module
def validate_category_hierarcy(module_store, course_id, parent_category, expected_child_category):
def validate_category_hierarchy(module_store, course_id, parent_category, expected_child_category):
err_cnt = 0
parents = []
@@ -324,11 +324,18 @@ def perform_xlint(data_dir, course_dirs,
for course_id in module_store.modules.keys():
# constrain that courses only have 'chapter' children
err_cnt += validate_category_hierarcy(module_store, course_id, "course", "chapter")
err_cnt += validate_category_hierarchy(module_store, course_id, "course", "chapter")
# constrain that chapters only have 'sequentials'
err_cnt += validate_category_hierarcy(module_store, course_id, "chapter", "sequential")
err_cnt += validate_category_hierarchy(module_store, course_id, "chapter", "sequential")
# constrain that sequentials only have 'verticals'
err_cnt += validate_category_hierarcy(module_store, course_id, "sequential", "vertical")
err_cnt += validate_category_hierarchy(module_store, course_id, "sequential", "vertical")
# check for a presence of a course marketing video
location_elements = course_id.split('/')
if Location(['i4x', location_elements[0], location_elements[1], 'about', 'video', None]) not in module_store.modules[course_id]:
print "WARN: Missing course marketing video. It is recommended that every course have a marketing video."
warn_cnt += 1
print "\n\n------------------------------------------\nVALIDATION SUMMARY: {0} Errors {1} Warnings\n".format(err_cnt, warn_cnt)