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

Merge branch 'release'

Browse Source 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
This commit is contained in:
Diana Huang
2013-09-13 17:15:44 -04:00
parent 4d99ef7eba 97a69e56df
commit 47ce9082e4
25 changed files with 224 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/test/data/open_ended/course/2012_Fall.xml
View File

@@ -4,5 +4,6 @@
<combinedopenended url_name="SampleQuestion1Attempt"/>
<peergrading url_name="PeerGradingSample"/>
<peergrading url_name="PeerGradingScored"/>
<peergrading url_name="PeerGradingLinked"/>
</chapter>
</course>

1
common/test/data/open_ended/peergrading/PeerGradingLinked.xml Normal file
View File

@@ -0,0 +1 @@
<peergrading is_graded="True" max_grade="1" use_for_single_location="True" link_to_location="i4x://edX/open_ended/combinedopenended/SampleQuestion"/>

1
common/test/data/open_ended_nopath/README.md Normal file
View File

@@ -0,0 +1 @@
This is a very very simple course, useful for debugging open ended grading code. This is specifically for testing if a peer grading module with no path to it in the course will be handled properly.

1
common/test/data/open_ended_nopath/course.xml Normal file
View File

@@ -0,0 +1 @@
<course org="edX" course="open_ended_nopath" url_name="2012_Fall"/>

4
common/test/data/open_ended_nopath/course/2012_Fall.xml Normal file
View File

@@ -0,0 +1,4 @@
<course>
<chapter url_name="Overview">
</chapter>
</course>

1
common/test/data/open_ended_nopath/peergrading/PeerGradingNoPath.xml Normal file
View File

@@ -0,0 +1 @@
<peergrading/>

11
common/test/data/open_ended_nopath/policies/2012_Fall.json Normal file
View File

@@ -0,0 +1,11 @@
{
"course/2012_Fall": {
"graceperiod": "2 days 5 hours 59 minutes 59 seconds",
"start": "2015-07-17T12:00",
"display_name": "Self Assessment Test",
"graded": "true"
},
"chapter/Overview": {
"display_name": "Overview"
}
}