Skip to content

E
edx-platform
Commit 3b3cf19c by Vik Paruchuri
Options

Fix tests and add in jasmine test

parent 23269359
Showing with 24 additions and 37 deletions
common/lib/xmodule/xmodule/js/fixtures/problem-with-markdown.html
<section class="problem-editor editor"> <section class="problem-editor editor">
<div class="row"> <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> <textarea class="xml-box" rows="8" cols="40">xml</textarea>
</div> </div>
</section> </section>
\ No newline at end of file
common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
...@@ -106,40 +106,22 @@ describe 'OpenEndedMarkdownEditingDescriptor', -> ...@@ -106,40 +106,22 @@ describe 'OpenEndedMarkdownEditingDescriptor', ->
data = OpenEndedMarkdownEditingDescriptor.markdownToXml("""[tasks] data = OpenEndedMarkdownEditingDescriptor.markdownToXml("""[tasks]
(Self), ({1-2}AI), ({1-4}AI), ({1-2}Peer (Self), ({1-2}AI), ({1-4}AI), ({1-2}Peer
[tasks] [tasks]
""") """, true)
data = data.replace(/[\t\n\s]/gmi,'') data = data.replace(/[\t\n\s]/gmi,'')
equality_list = """ equality_list = """
<combinedopenended> <combinedopenended>
<task> <task>
<selfassessment/> <selfassessment/>
</task> </task>
<task> <task>
<openended min_score_to_attempt="1" max_score_to_attempt="2"> <openended min_score_to_attempt="1" max_score_to_attempt="2">ml_grading.conf</openended>
<openendedparam> </task>
<initial_display>Enter essay here.</initial_display> <task>
<answer_display>This is the answer.</answer_display> <openended min_score_to_attempt="1" max_score_to_attempt="4">ml_grading.conf</openended>
<grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload> </task>
</openendedparam> <task>
</openended> <openended min_score_to_attempt="1" max_score_to_attempt="2">peer_grading.conf</openended>
</task> </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>
</combinedopenended> </combinedopenended>
""" """
expect(data).toEqual(equality_list.replace(/[\t\n\s]/gmi,'')) expect(data).toEqual(equality_list.replace(/[\t\n\s]/gmi,''))
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
...@@ -140,8 +140,8 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor ...@@ -140,8 +140,8 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor
else else
return template return template
@markdownToXml: (markdown)-> @markdownToXml: (markdown, mock=false)->
toXml = `function(markdown) { toXml = `function(markdown, mock) {
function template(template_html,data){ function template(template_html,data){
return template_html.replace(/%(\w*)%/g,function(m,key){return data.hasOwnProperty(key)?data[key]:"";}); return template_html.replace(/%(\w*)%/g,function(m,key){return data.hasOwnProperty(key)?data[key]:"";});
...@@ -183,7 +183,11 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor ...@@ -183,7 +183,11 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor
// group tasks // group tasks
xml = xml.replace(/\[tasks\]\n?([^\]]*)\[\/?tasks\]/gmi, function(match, p) { 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 groupString = '';
var options = p.split(","); var options = p.split(",");
for(var i = 0; i < options.length; i++) { for(var i = 0; i < options.length; i++) {
......
lms/djangoapps/courseware/module_render.py
...@@ -217,8 +217,8 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours ...@@ -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 #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 #Get descriptor metadata fields indicating needs for various settings
needs_open_ended_interface = hasattr(descriptor, "needs_open_ended_interface", False) needs_open_ended_interface = getattr(descriptor, "needs_open_ended_interface", False)
needs_s3_interface = hasattr(descriptor, "needs_s3_interface", False) needs_s3_interface = getattr(descriptor, "needs_s3_interface", False)
#Initialize interfaces to None #Initialize interfaces to None
open_ended_grading_interface = None open_ended_grading_interface = None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment