Merge pull request #486 from MITx/feature/victor/create-test-courses

Feature/victor/create test courses

Merge pull request #486 from MITx/feature/victor/create-test-courses
Feature/victor/create test courses
2a8f5a47 · Calen Pennington · dca434ad · a7a9abab · 2a8f5a47 · 2a8f5a47
Commit 2a8f5a47 authored Aug 21, 2012 by Calen Pennington
10 changed files
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -86,7 +86,7 @@ class HtmlDescriptor(XmlDescriptor, EditingDescriptor):
            # online and has imported all current (fall 2012) courses from xml
            if not system.resources_fs.exists(filepath):
                candidates = cls.backcompat_paths(filepath)
-                log.debug("candidates = {0}".format(candidates))
+                #log.debug("candidates = {0}".format(candidates))
                for candidate in candidates:
                    if system.resources_fs.exists(candidate):
                        filepath = candidate

--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -38,7 +38,7 @@ def get_metadata_from_xml(xml_object, remove=True):
    if meta is None:
        return ''
    dmdata = meta.text
-    log.debug('meta for %s loaded: %s' % (xml_object,dmdata))
+    #log.debug('meta for %s loaded: %s' % (xml_object,dmdata))
    if remove:
        xml_object.remove(meta)
    return dmdata

--- a/common/test/data/test_start_date/README.md
+++ b/common/test/data/test_start_date/README.md
+Simple course.  If start dates are on, non-staff users should see Overview, but not Ch 2.
--- a/common/test/data/test_start_date/course.xml
+++ b/common/test/data/test_start_date/course.xml
+roots/2012_Fall.xml
\ No newline at end of file
--- a/common/test/data/test_start_date/course/2012_Fall.xml
+++ b/common/test/data/test_start_date/course/2012_Fall.xml
+<course>
+  <chapter url_name="Overview">
+    <videosequence url_name="Toy_Videos">
+      <html url_name="toylab"/>
+      <video url_name="Video_Resources" youtube="1.0:1bK-WdDi6Qw"/>
+    </videosequence>
+    <video url_name="Welcome" youtube="1.0:p2Q6BrNhdh8"/>
+  </chapter>
+  <chapter url_name="Ch2">
+     <html url_name="test_html">
+         <h2>Welcome</h2>
+     </html>
+  </chapter>
+</course>
--- a/common/test/data/test_start_date/html/toylab.html
+++ b/common/test/data/test_start_date/html/toylab.html
+<b>Lab 2A: Superposition Experiment</b>
+<p>Isn't the toy course great?</p>
--- a/common/test/data/test_start_date/html/toylab.xml
+++ b/common/test/data/test_start_date/html/toylab.xml
+<html filename="toylab.html"/>
\ No newline at end of file
--- a/common/test/data/test_start_date/policies/2012_Fall.json
+++ b/common/test/data/test_start_date/policies/2012_Fall.json
+{
+    "course/2012_Fall": {
+        "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
+        "start": "2011-07-17T12:00",
+        "display_name": "Toy Course"
+    },
+    "chapter/Overview": {
+        "display_name": "Overview"
+    },
+    "chapter/Ch2": {
+       "display_name": "Chapter 2",
+       "start": "2015-07-17T12:00"
+    },
+    "videosequence/Toy_Videos": {
+        "display_name": "Toy Videos",
+        "format": "Lecture Sequence"
+    },
+    "html/toylab": {
+        "display_name": "Toy lab"
+    },
+    "video/Video_Resources": {
+        "display_name": "Video Resources"
+    },
+    "video/Welcome": {
+        "display_name": "Welcome"
+    }
+}
--- a/common/test/data/test_start_date/roots/2012_Fall.xml
+++ b/common/test/data/test_start_date/roots/2012_Fall.xml
+<course org="edX" course="test_start_date" url_name="2012_Fall"/>
\ No newline at end of file
--- a/common/test/data/toy/html/toylab.xml
+++ b/common/test/data/toy/html/toylab.xml
+<html filename="toylab.html"/>
\ No newline at end of file