Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

Conflicts: cms/djangoapps/contentstore/management/commands/tests/test_import.py cms/djangoapps/contentstore/tests/test_import.py common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py common/lib/xmodule/xmodule/modulestore/xml_importer.py lms/djangoapps/bulk_email/tests/test_course_optout.py lms/djangoapps/bulk_email/tests/test_email.py lms/djangoapps/bulk_email/tests/test_err_handling.py lms/djangoapps/class_dashboard/tests/test_dashboard_data.py lms/djangoapps/courseware/courses.py lms/djangoapps/django_comment_client/base/views.py lms/djangoapps/instructor/tests/test_email.py lms/djangoapps/instructor/tests/test_legacy_anon_csv.py lms/djangoapps/instructor/tests/test_legacy_download_csv.py lms/djangoapps/instructor/tests/test_legacy_email.py lms/djangoapps/instructor/tests/test_legacy_enrollment.py lms/djangoapps/instructor/tests/test_legacy_forum_admin.py lms/djangoapps/instructor/tests/test_legacy_gradebook.py lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py lms/djangoapps/instructor/tests/test_legacy_reset.py lms/djangoapps/instructor/views/api.py lms/djangoapps/instructor/views/instructor_dashboard.py lms/djangoapps/instructor/views/legacy.py lms/templates/courseware/instructor_dashboard.html
2014-05-13 15:30:56 -04:00
parent 16faafded9 9407102b45
commit 240d91daeb
338 changed files with 18913 additions and 7210 deletions
--- a/common/test/data/simple/static/images_course_image.jpg
+++ b/common/test/data/simple/static/images_course_image.jpg
--- a/common/test/data/test_import_course_2/about/end_date.html
+++ b/common/test/data/test_import_course_2/about/end_date.html
@@ -0,0 +1 @@
+TBD
--- a/common/test/data/test_import_course_2/chapter/vertical_container.xml
+++ b/common/test/data/test_import_course_2/chapter/vertical_container.xml
@@ -0,0 +1,3 @@
+<sequential>
+    <sequential filename='vertical_sequential' slug='vertical_sequential' />
+</sequential>
--- a/common/test/data/test_import_course_2/course.xml
+++ b/common/test/data/test_import_course_2/course.xml
@@ -0,0 +1 @@
+<course org="edX" course="test_import" url_name="2014_Fall"/>
--- a/common/test/data/test_import_course_2/course/2014_Fall.xml
+++ b/common/test/data/test_import_course_2/course/2014_Fall.xml
@@ -0,0 +1,20 @@
+<course>
+    <textbook title="Textbook" book_url="https://s3.amazonaws.com/edx-textbooks/guttag_computation_v3/"/>
+  <chapter url_name="Overview">
+    <videosequence url_name="Toy_Videos">
+      <html url_name="secret:toylab"/>
+      <html url_name="toyjumpto"/>
+      <html url_name="toyhtml"/>
+      <html url_name="nonportable"/>
+      <html url_name="nonportable_link"/>
+      <video url_name="Video_Resources" youtube_id_1_0="1bK-WdDi6Qw" display_name="Video Resources"/>
+    </videosequence>
+    <video url_name="Welcome" youtube_id_1_0="p2Q6BrNhdh8" display_name="Welcome"/>
+    <video url_name="video_123456789012" youtube_id_1_0="p2Q6BrNhdh8" display_name='Test Video'/>
+    <video url_name="video_4f66f493ac8f" youtube_id_1_0="p2Q6BrNhdh8"/>
+  </chapter>
+  <chapter url_name="secret:magic"/>
+  <chapter url_name="poll_test"/>
+  <chapter url_name="vertical_container"/>
+  <chapter url_name="handout_container"/>
+</course>
--- a/common/test/data/test_import_course_2/info/handouts.html
+++ b/common/test/data/test_import_course_2/info/handouts.html
@@ -0,0 +1 @@
+<a href='/static/handouts/sample_handout.txt'>Sample</a>
--- a/common/test/data/test_import_course_2/policies/2012_Fall.json
+++ b/common/test/data/test_import_course_2/policies/2012_Fall.json
@@ -0,0 +1,33 @@
+{
+    "course/2012_Fall": {
+        "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
+        "start": "2015-07-17T12:00",
+        "display_name": "Toy Course",
+        "graded": "true",
+	"tabs": [
+          {"type": "courseware"},
+          {"type": "course_info", "name": "Course Info"},
+          {"type": "static_tab", "url_slug": "syllabus", "name": "Syllabus"},
+          {"type": "static_tab", "url_slug": "resources", "name": "Resources"},
+          {"type": "discussion", "name": "Discussion"},
+          {"type": "wiki", "name": "Wiki"},
+          {"type": "progress", "name": "Progress"}
+        ]
+    },
+    "chapter/Overview": {
+        "display_name": "Overview"
+    },
+    "videosequence/Toy_Videos": {
+        "display_name": "Toy Videos",
+        "format": "Lecture Sequence"
+    },
+    "html/secret:toylab": {
+        "display_name": "Toy lab"
+    },
+    "video/Video_Resources": {
+        "display_name": "Video Resources"
+    },
+    "video/Welcome": {
+        "display_name": "Welcome"
+    }
+}
--- a/common/test/data/test_import_course_2/sequential/vertical_sequential.xml
+++ b/common/test/data/test_import_course_2/sequential/vertical_sequential.xml
@@ -0,0 +1,4 @@
+<sequential>
+    <vertical filename="vertical_test" slug="vertical_test" />
+    <html slug="unicode">…</html>
+</sequential>
--- a/common/test/data/test_import_course_2/vertical/vertical_test.xml
+++ b/common/test/data/test_import_course_2/vertical/vertical_test.xml
@@ -0,0 +1,9 @@
+<sequential>
+    <video display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY" name="sample_video"/>
+    <video url_name="separate_file_video"/>
+    <poll_question name="T1_changemind_poll_foo_2" display_name="Change your answer" reset="false">
+        <p>Have you changed your mind?</p>
+        <answer id="yes">Yes</answer>
+        <answer id="no">No</answer>
+    </poll_question>
+</sequential>
--- a/common/test/data/test_import_course_2/video/separate_file_video.xml
+++ b/common/test/data/test_import_course_2/video/separate_file_video.xml
@@ -0,0 +1 @@
+<video display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY" name="sample_video"/>
--- a/common/test/data/toy/course/2012_Fall.xml
+++ b/common/test/data/toy/course/2012_Fall.xml
@@ -1,4 +1,4 @@
-<course>
+<course course_image="just_a_test.jpg">
    <textbook title="Textbook" book_url="https://s3.amazonaws.com/edx-textbooks/guttag_computation_v3/"/>
  <chapter url_name="Overview">
    <videosequence url_name="Toy_Videos">
--- a/common/test/data/toy/static/just_a_test.jpg
+++ b/common/test/data/toy/static/just_a_test.jpg
				`@@ -0,0 +1 @@`
				`<course org="edX" course="test_import" url_name="2014_Fall"/>`
				`@@ -0,0 +1 @@`
				`<a href='/static/handouts/sample_handout.txt'>Sample</a>`
				`@@ -0,0 +1 @@`
				`<video display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY" name="sample_video"/>`