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

Fix tests and add in jasmine test

Browse Source
This commit is contained in:
Vik Paruchuri
2013-05-20 15:52:19 -04:00
parent 23269359c1
commit 3b3cf19c47
4 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/xmodule/xmodule/js/fixtures/problem-with-markdown.html
View File

@@ -1,6 +1,6 @@
<section class="problem-editor editor">
<div class="row">
<textarea class="markdown-box">[prompt]prompt[prompt]</textarea>
<textarea class="markdown-box">markdown</textarea>
<textarea class="xml-box" rows="8" cols="40">xml</textarea>
</div>
</section>

44
common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
View File

@@ -106,40 +106,22 @@ describe 'OpenEndedMarkdownEditingDescriptor', ->
data = OpenEndedMarkdownEditingDescriptor.markdownToXml("""[tasks]
(Self), ({1-2}AI), ({1-4}AI), ({1-2}Peer
[tasks]
""")
""", true)
data = data.replace(/[\t\n\s]/gmi,'')
equality_list = """
<combinedopenended>
<task>
<selfassessment/>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="2">
<openendedparam>
<initial_display>Enter essay here.</initial_display>
<answer_display>This is the answer.</answer_display>
<grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
</openendedparam>
</openended>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="4">
<openendedparam>
<initial_display>Enter essay here.</initial_display>
<answer_display>This is the answer.</answer_display>
<grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
</openendedparam>
</openended>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="2">
<openendedparam>
<initial_display>Enter essay here.</initial_display>
<answer_display>This is the answer.</answer_display>
<grader_payload>{"grader_settings" : "peer_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
</openendedparam>
</openended>
</task>
<task>
<selfassessment/>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="2">ml_grading.conf</openended>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="4">ml_grading.conf</openended>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="2">peer_grading.conf</openended>
</task>
</combinedopenended>
"""
expect(data).toEqual(equality_list.replace(/[\t\n\s]/gmi,''))

10
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
View File

@@ -140,8 +140,8 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor
else
return template
@markdownToXml: (markdown)->
toXml = `function(markdown) {
@markdownToXml: (markdown, mock=false)->
toXml = `function(markdown, mock) {
function template(template_html,data){
return template_html.replace(/%(\w*)%/g,function(m,key){return data.hasOwnProperty(key)?data[key]:"";});
@@ -183,7 +183,11 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor
// group tasks
xml = xml.replace(/\[tasks\]\n?([^\]]*)\[\/?tasks\]/gmi, function(match, p) {
var open_ended_template = $('#open-ended-template').html()
if(mock == false){
var open_ended_template = $('#open-ended-template').html();
} else {
var open_ended_template = "<openended %min_max_string%>%grading_config%</openended>";
}
var groupString = '';
var options = p.split(",");
for(var i = 0; i < options.length; i++) {

4
lms/djangoapps/courseware/module_render.py
View File

@@ -217,8 +217,8 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
#this first checks to see if the descriptor is the correct one, and only sends settings if it is
#Get descriptor metadata fields indicating needs for various settings
needs_open_ended_interface = hasattr(descriptor, "needs_open_ended_interface", False)
needs_s3_interface = hasattr(descriptor, "needs_s3_interface", False)
needs_open_ended_interface = getattr(descriptor, "needs_open_ended_interface", False)
needs_s3_interface = getattr(descriptor, "needs_s3_interface", False)
#Initialize interfaces to None
open_ended_grading_interface = None