Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor

cms/templates/widgets/problem-edit.html

@@ -12,7 +12,7 @@
                         class="problem-editor-icon string"></span></a></li>
                 <li><a href="#" class="number-button" data-tooltip="Numerical Response"><span
                         class="problem-editor-icon number"></span></a></li>
-                <li><a href="#" class="dropdown-button" data-tooltip="Dropdown"><span
+                <li><a href="#" class="dropdown-button" data-tooltip="Option Response"><span
                         class="problem-editor-icon dropdown"></span></a></li>
             </ul>
             <ul class="editor-tabs">
@@ -41,7 +41,7 @@
                 </div>
             </div>
             <div class="row">
-                <h6>Multiple Check</h6>
+                <h6>Check Multiple</h6>
                 <div class="col sample">
                     <img src="/static/img/multi-example.png" />
                 </div>

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

+<section class="problem-editor editor">
+    <div class="row">
+        <textarea class="markdown-box">markdown</textarea>
+        <textarea class="xml-box" rows="8" cols="40">xml</textarea>
+    </div>
+</section>
\ No newline at end of file

common/lib/xmodule/xmodule/js/fixtures/problem-without-markdown.html

+<section class="problem-editor editor">
+    <div class="row">
+        <textarea class="xml-box" rows="8" cols="40">xml only</textarea>
+    </div>
+</section>
\ No newline at end of file

common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee

 describe 'MarkdownEditingDescriptor', ->
+  describe 'save stores the correct data', ->
+    it 'saves markdown from markdown editor', ->
+      loadFixtures 'problem-with-markdown.html'
+      @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>')
+    it 'clears markdown when xml editor is selected', ->
+      loadFixtures 'problem-with-markdown.html'
+      @descriptor = new MarkdownEditingDescriptor($('.problem-editor'))
+      @descriptor.createXMLEditor('replace with markdown')
+      saveResult = @descriptor.save()
+      expect(saveResult.metadata.markdown).toEqual(null)
+      expect(saveResult.data).toEqual('replace with markdown')
+    it 'saves xml from the xml editor', ->
+      loadFixtures 'problem-without-markdown.html'
+      @descriptor = new MarkdownEditingDescriptor($('.problem-editor'))
+      saveResult = @descriptor.save()
+      expect(saveResult.metadata.markdown).toEqual(null)
+      expect(saveResult.data).toEqual('xml only')
 
   describe 'insertMultipleChoice', ->
     it 'inserts the template if selection is empty', ->