Reduce option of html xblock to text only

cms/djangoapps/contentstore/tests/test_crud.py

@@ -25,7 +25,6 @@ def test_get_templates(self):
         self.assertIsNotNone(found.get('problem'))
         self.assertEqual(len(found.get('course')), 0)
         self.assertEqual(len(found.get('about')), 1)
-        self.assertGreaterEqual(len(found.get('html')), 2)
         self.assertGreaterEqual(len(found.get('problem')), 10)
         dropdown = None
         for template in found['problem']:
@@ -42,10 +41,10 @@ def test_get_templates(self):
 
     def test_get_some_templates(self):
         self.assertEqual(len(SequenceDescriptor.templates()), 0)
-        self.assertGreater(len(HtmlDescriptor.templates()), 0)
+        self.assertGreater(len(CapaDescriptor.templates()), 0)
         self.assertIsNone(SequenceDescriptor.get_template('doesntexist.yaml'))
-        self.assertIsNone(HtmlDescriptor.get_template('doesntexist.yaml'))
-        self.assertIsNotNone(HtmlDescriptor.get_template('announcement.yaml'))
+        self.assertIsNone(CapaDescriptor.get_template('doesntexist.yaml'))
+        self.assertIsNotNone(CapaDescriptor.get_template('blank_common.yaml'))
 
     def test_factories(self):
         test_course = CourseFactory.create(

cms/djangoapps/contentstore/views/tests/test_item.py

@@ -223,13 +223,13 @@ def test_split_test(self):
         root_usage_key = self._create_vertical()
         resp = self.create_xblock(category='split_test', parent_usage_key=root_usage_key)
         split_test_usage_key = self.response_usage_key(resp)
-        resp = self.create_xblock(parent_usage_key=split_test_usage_key, category='html', boilerplate='announcement.yaml')
+        resp = self.create_xblock(parent_usage_key=split_test_usage_key, category='problem', boilerplate='blank_common.yaml')
         self.assertEqual(resp.status_code, 200)
-        resp = self.create_xblock(parent_usage_key=split_test_usage_key, category='html', boilerplate='zooming_image.yaml')
+        resp = self.create_xblock(parent_usage_key=split_test_usage_key, category='problem', boilerplate='checkboxes_response.yaml')
         self.assertEqual(resp.status_code, 200)
         html, __ = self._get_container_preview(split_test_usage_key)
-        self.assertIn('Announcement', html)
-        self.assertIn('Zooming', html)
+        self.assertIn('Blank Common Problem', html)
+        self.assertIn('Checkboxes', html)
 
     def test_split_test_edited(self):
         """

common/lib/xmodule/xmodule/html_module.py

@@ -119,7 +119,6 @@ class HtmlDescriptor(HtmlBlock, XmlDescriptor, EditingDescriptor):  # pylint: di
     mako_template = "widgets/html-edit.html"
     module_class = HtmlModule
     filename_extension = "xml"
-    template_dir_name = "html"
     show_in_read_only_mode = True
 
     js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}