Merge pull request #2869 from edx/bugfix/ichuang/textline-inline-for-jspre

fix capa textline to properly use inline if specified when using math preprocessor

common/lib/capa/capa/templates/textline.html

@@ -3,7 +3,7 @@
 <section id="inputtype_${id}" class="${'text-input-dynamath' if do_math else ''} capa_inputtype ${doinline} textline" >
 
     % if preprocessor is not None:
-    <div class="text-input-dynamath_data" data-preprocessor="${preprocessor['class_name']}"/>
+    <div class="text-input-dynamath_data ${doinline}" data-preprocessor="${preprocessor['class_name']}"/>
     <div class="script_placeholder" data-src="${preprocessor['script_src']}"/>
     % endif
 

common/lib/capa/capa/tests/test_input_templates.py

@@ -431,12 +431,21 @@ class TextlineTemplateTest(TemplateTestCase):
                                         'script_src': 'test_script'}
         xml = self.render_to_xml(self.context)
 
-        xpath = "//div[@class='text-input-dynamath_data' and @data-preprocessor='test_class']"
+        xpath = "//div[contains(@class, 'text-input-dynamath_data') and @data-preprocessor='test_class']"
         self.assert_has_xpath(xml, xpath, self.context)
 
         xpath = "//div[@class='script_placeholder' and @data-src='test_script']"
         self.assert_has_xpath(xml, xpath, self.context)
 
+    def test_do_inline_and_preprocessor(self):
+        self.context['preprocessor'] = {'class_name': 'test_class',
+                                        'script_src': 'test_script'}
+        self.context['inline'] = True
+        xml = self.render_to_xml(self.context)
+
+        xpath = "//div[contains(@class, 'text-input-dynamath_data inline') and @data-preprocessor='test_class']"
+        self.assert_has_xpath(xml, xpath, self.context)
+
     def test_do_inline(self):
         cases = [('correct', 'correct'),
                  ('unsubmitted', 'unanswered'),