fix: add problem block

Author: irtazaakram

openedx/envs/common.py

@@ -2095,7 +2095,7 @@ def add_optional_apps(optional_apps, installed_apps):
 # .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
 # .. toggle_target_removal_date: 2025-06-01
-USE_EXTRACTED_PROBLEM_BLOCK = False
+USE_EXTRACTED_PROBLEM_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_VIDEO_BLOCK
 # .. toggle_default: False

requirements/edx/base.txt

@@ -1267,7 +1267,7 @@ xblock-utils==4.0.0
     # via
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.10.2
+git+https://github.com/openedx/xblocks-contrib.git@fix-problemblock
     # via -r requirements/edx/bundled.in
 xmlsec==1.3.14
     # via

requirements/edx/development.txt

@@ -2299,7 +2299,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/testing.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.10.2
+git+https://github.com/openedx/xblocks-contrib.git@fix-problemblock
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt

requirements/edx/doc.txt

@@ -1609,7 +1609,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.10.2
+git+https://github.com/openedx/xblocks-contrib.git@fix-problemblock
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via

requirements/edx/testing.txt

@@ -1699,7 +1699,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.10.2
+git+https://github.com/openedx/xblocks-contrib.git@fix-problemblock
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via

xmodule/tests/test_capa_block.py

@@ -203,7 +203,7 @@ class CapaFactoryWithFiles(CapaFactory):
 
 @ddt.ddt
 @skip_unless_lms
-class ProblemBlockTest(unittest.TestCase):  # pylint: disable=too-many-public-methods
+class _ProblemBlockTestBase(unittest.TestCase):  # pylint: disable=too-many-public-methods
     """Tests for various problem types in XBlocks."""
 
     def setUp(self):
@@ -2843,8 +2843,18 @@ def test_problem_no_display_name(self, display_name, render_template):
         assert context["problem"]["name"] == block.location.block_type
 
 
+@override_settings(USE_EXTRACTED_PROBLEM_BLOCK=True)
+class ExtractedProblemBlockTestCase(_ProblemBlockTestBase):
+    __test__ = True
+
+
+@override_settings(USE_EXTRACTED_PROBLEM_BLOCK=False)
+class BuiltInProblemBlockTestCase(_ProblemBlockTestBase):
+    __test__ = True
+
+
 @ddt.ddt
-class ProblemBlockXMLTest(unittest.TestCase):
+class _ProblemBlockXMLTestBase(unittest.TestCase):
     """Tests XML strings for various problem types in XBlocks."""
 
     sample_checkbox_problem_xml = textwrap.dedent(
@@ -3693,6 +3703,16 @@ def test_invalid_dropdown_xml(self):
             CapaFactory.create(xml=problem_xml)
 
 
+@override_settings(USE_EXTRACTED_PROBLEM_BLOCK=True)
+class ExtractedProblemBlockXMLTestCase(_ProblemBlockXMLTestBase):
+    __test__ = True
+
+
+@override_settings(USE_EXTRACTED_PROBLEM_BLOCK=False)
+class BuiltInProblemBlockXMLTestCase(_ProblemBlockXMLTestBase):
+    __test__ = True
+
+
 class ComplexEncoderTest(unittest.TestCase):
     """Tests JSON encoding of complex numbers."""
 
@@ -3709,7 +3729,7 @@ def test_default(self):
 
 @skip_unless_lms
 @UseUnsafeCodejail()
-class ProblemCheckTrackingTest(unittest.TestCase):
+class _ProblemCheckTrackingTestBase(unittest.TestCase):
     """
     Ensure correct tracking information is included in events emitted during problem checks.
     """
@@ -4045,7 +4065,17 @@ def test_get_answer_with_jump_to_id_urls(self):
         assert problem.runtime.service(problem, "replace_urls").replace_urls.called
 
 
-class ProblemBlockReportGenerationTest(unittest.TestCase):
+@override_settings(USE_EXTRACTED_PROBLEM_BLOCK=True)
+class ExtractedProblemCheckTrackingTestCase(_ProblemCheckTrackingTestBase):
+    __test__ = True
+
+
+@override_settings(USE_EXTRACTED_PROBLEM_BLOCK=False)
+class BuiltInProblemCheckTrackingTestCase(_ProblemCheckTrackingTestBase):
+    __test__ = True
+
+
+class _ProblemBlockReportGenerationTestBase(unittest.TestCase):
     """
     Ensure that Capa report generation works correctly
     """
@@ -4140,3 +4170,13 @@ def test_generate_report_data_report_loncapa_error(self):
                 )
             )
             assert "Python Error: No Answer Retrieved" in list(report_data[0][1].values())
+
+
+@override_settings(USE_EXTRACTED_PROBLEM_BLOCK=True)
+class ExtractedProblemBlockReportGenerationTestCase(_ProblemBlockReportGenerationTestBase):
+    __test__ = True
+
+
+@override_settings(USE_EXTRACTED_PROBLEM_BLOCK=False)
+class BuiltInProblemBlockReportGenerationTestCase(_ProblemBlockReportGenerationTestBase):
+    __test__ = True