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

Remove pretty print from markdown xml - TNL-5768

Browse Source 
Revert commit bf9d467
This commit is contained in:
Mushtaq Ali
2016-11-01 15:52:31 +05:00
parent 0e8dacc72a
commit d337da7458
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
View File

@@ -5,7 +5,7 @@ describe 'MarkdownEditingDescriptor', ->
@descriptor = new MarkdownEditingDescriptor($('.problem-editor'))
saveResult = @descriptor.save()
expect(saveResult.metadata.markdown).toEqual('markdown')
expect(saveResult.data).toEqual('<problem>\n <p>markdown</p>\n</problem>')
expect(saveResult.data).toXMLEqual('<problem>\n <p>markdown</p>\n</problem>')
it 'clears markdown when xml editor is selected', ->
loadFixtures 'problem-with-markdown.html'
@descriptor = new MarkdownEditingDescriptor($('.problem-editor'))
@@ -101,7 +101,7 @@ describe 'MarkdownEditingDescriptor', ->
describe 'markdownToXml', ->
it 'converts raw text to paragraph', ->
data = MarkdownEditingDescriptor.markdownToXml('foo')
expect(data).toEqual('<problem>\n <p>foo</p>\n</problem>')
expect(data).toXMLEqual('<problem>\n <p>foo</p>\n</problem>')
# test default templates
it 'converts numerical response to xml', ->
data = MarkdownEditingDescriptor.markdownToXml("""A numerical response problem accepts a line of text input from the student, and evaluates the input for correctness based on its numerical value.
@@ -133,7 +133,7 @@ describe 'MarkdownEditingDescriptor', ->
If you look at your hand, you can count that you have five fingers.
[Explanation]
""")
expect(data).toEqual("""<problem>
expect(data).toXMLEqual("""<problem>
<p>A numerical response problem accepts a line of text input from the student, and evaluates the input for correctness based on its numerical value.</p>
<p>The answer is correct if it is within a specified numerical tolerance of the expected answer.</p>
<p>Enter the numerical value of Pi:</p>
@@ -356,7 +356,7 @@ describe 'MarkdownEditingDescriptor', ->
When the student is ready, the explanation appears.
[Explanation]
""")
expect(data).toEqual("""
expect(data).toXMLEqual("""
<problem>
<p>bleh</p>
<multiplechoiceresponse>
@@ -680,7 +680,7 @@ describe 'MarkdownEditingDescriptor', ->
Code should be nicely monospaced.
[/code]
""")
expect(data).toEqual("""
expect(data).toXMLEqual("""
<problem>
<p>Not a header</p>
<h3 class="hd hd-2 problem-header">A header</h3>

2
common/lib/xmodule/xmodule/js/spec/problem/edit_spec_hint.coffee
View File

@@ -25,7 +25,7 @@ describe 'Markdown to xml extended hint dropdown', ->
]]
""")
expect(data).toEqual("""
expect(data).toXMLEqual("""
<problem>
<p>Translation between Dropdown and ________ is straightforward.</p>
<optionresponse>

6
common/lib/xmodule/xmodule/js/src/problem/edit.js
View File

@@ -1,4 +1,4 @@
/* global CodeMirror, _, XModule, PrettyPrint */
/* global CodeMirror, _, XModule */
// no-useless-escape disabled because of warnings in regexp expressions within the
// "toXML" code. When the "useless escapes" were removed, some of the unit tests
// failed, but only in Jenkins, indicating browser-specific behavior.
@@ -819,8 +819,8 @@
}
// make all responsetypes descendants of a single problem element
// safe-lint: disable=javascript-concat-html
finalXml = '<problem>' + responseTypesXML.join('\n\n') + finalDemandHints + '</problem>';
return PrettyPrint.xml(finalXml);
finalXml = '<problem>\n' + responseTypesXML.join('\n\n') + finalDemandHints + '\n</problem>';
return finalXml;
};
return MarkdownEditingDescriptor;