Skip to content

Commit

Permalink
Merge branch 'master' into jci/issue#35836
Browse files Browse the repository at this point in the history
  • Loading branch information
jciasenza authored Dec 9, 2024
2 parents 5520a96 + 394a459 commit f779533
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 86 deletions.
4 changes: 2 additions & 2 deletions cms/djangoapps/contentstore/views/tests/test_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,12 +312,12 @@ def test_split_test(self):
resp = self.create_xblock(
parent_usage_key=split_test_usage_key,
category="html",
boilerplate="zooming_image.yaml",
boilerplate="latex_html.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("LaTeX", html)

def test_split_test_edited(self):
"""
Expand Down
57 changes: 0 additions & 57 deletions xmodule/templates/html/zooming_image.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions xmodule/templates/test/zooming_image.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions xmodule/tests/test_resource_templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class ResourceTemplatesTests(unittest.TestCase):
def test_templates(self):
expected = {
'latex_html.yaml',
'zooming_image.yaml',
'announcement.yaml',
'anon_user_id.yaml'}
got = {t['template_id'] for t in TestClass.templates()}
Expand All @@ -38,7 +37,6 @@ def test_get_custom_template(self):
def test_custom_templates(self):
expected = {
'latex_html.yaml',
'zooming_image.yaml',
'announcement.yaml',
'anon_user_id.yaml'}
got = {t['template_id'] for t in TestClassResourceTemplate.templates()}
Expand Down

0 comments on commit f779533

Please sign in to comment.