refactor: remove Django30CompatibleTestCase

benchmarks/component_rendering.py

@@ -6,7 +6,7 @@ from django.test import override_settings
 from django_components import component
 from django_components.middleware import CSS_DEPENDENCY_PLACEHOLDER, JS_DEPENDENCY_PLACEHOLDER
 from tests.django_test_setup import *  # NOQA
-from tests.testutils import Django30CompatibleSimpleTestCase as SimpleTestCase
+from tests.testutils import BaseTestCase
 from tests.testutils import create_and_process_template_response
 
 
@@ -67,7 +67,7 @@ EXPECTED_JS = """<script src="test.js"></script>"""
 
 
 @override_settings(COMPONENTS={"RENDER_DEPENDENCIES": True})
-class RenderBenchmarks(SimpleTestCase):
+class RenderBenchmarks(BaseTestCase):
     def setUp(self):
         component.registry.clear()
         component.registry.register("test_component", SlottedComponent)

tests/test_autodiscover.py

@@ -6,7 +6,7 @@ from django.urls import include, path
 
 # isort: off
 from .django_test_setup import settings
-from .testutils import Django30CompatibleSimpleTestCase as SimpleTestCase
+from .testutils import BaseTestCase
 
 # isort: on
 
@@ -18,7 +18,7 @@ urlpatterns = [
 ]
 
 
-class TestAutodiscover(SimpleTestCase):
+class TestAutodiscover(BaseTestCase):
     def setUp(self):
         settings.SETTINGS_MODULE = "tests.test_autodiscover"  # noqa
 
@@ -38,7 +38,7 @@ class TestAutodiscover(SimpleTestCase):
         self.assertEqual(imported_components_count, 1)
 
 
-class TestLoaderSettingsModule(SimpleTestCase):
+class TestLoaderSettingsModule(BaseTestCase):
     def tearDown(self) -> None:
         del settings.SETTINGS_MODULE  # noqa
 
@@ -106,7 +106,7 @@ class TestLoaderSettingsModule(SimpleTestCase):
         )
 
 
-class TestBaseDir(SimpleTestCase):
+class TestBaseDir(BaseTestCase):
     def setUp(self):
         settings.BASE_DIR = Path(__file__).parent.resolve() / "test_structures" / "test_structure_1"  # noqa
         settings.SETTINGS_MODULE = "tests_fake.test_autodiscover_fake"  # noqa
@@ -125,7 +125,7 @@ class TestBaseDir(SimpleTestCase):
         self.assertEqual(sorted(dirs), sorted(expected))
 
 
-class TestFilepathToPythonModule(SimpleTestCase):
+class TestFilepathToPythonModule(BaseTestCase):
     def test_prepares_path(self):
         self.assertEqual(
             _filepath_to_python_module(Path("tests.py")),

tests/test_component.py

@@ -8,14 +8,14 @@ from django.test import override_settings
 
 # isort: off
 from .django_test_setup import *  # NOQA
-from .testutils import Django30CompatibleSimpleTestCase as SimpleTestCase
+from .testutils import BaseTestCase
 
 # isort: on
 
 from django_components import component
 
 
-class ComponentTest(SimpleTestCase):
+class ComponentTest(BaseTestCase):
     def test_empty_component(self):
         class EmptyComponent(component.Component):
             pass
@@ -260,7 +260,7 @@ class ComponentTest(SimpleTestCase):
         )
 
 
-class InlineComponentTest(SimpleTestCase):
+class InlineComponentTest(BaseTestCase):
     def test_inline_html_component(self):
         class InlineHTMLComponent(component.Component):
             template = "<div class='inline'>Hello Inline</div>"
@@ -382,7 +382,7 @@ class InlineComponentTest(SimpleTestCase):
         )
 
 
-class ComponentMediaTests(SimpleTestCase):
+class ComponentMediaTests(BaseTestCase):
     def test_component_media_with_strings(self):
         class SimpleComponent(component.Component):
             class Media:
@@ -491,7 +491,7 @@ class ComponentMediaTests(SimpleTestCase):
         )
 
 
-class ComponentIsolationTests(SimpleTestCase):
+class ComponentIsolationTests(BaseTestCase):
     def setUp(self):
         class SlottedComponent(component.Component):
             template_name = "slotted_template.html"
@@ -539,7 +539,7 @@ class ComponentIsolationTests(SimpleTestCase):
         )
 
 
-class SlotBehaviorTests(SimpleTestCase):
+class SlotBehaviorTests(BaseTestCase):
     def setUp(self):
         class SlottedComponent(component.Component):
             template_name = "slotted_template.html"

tests/test_component_as_view.py

@@ -7,7 +7,7 @@ from django.urls import include, path
 
 # isort: off
 from .django_test_setup import *  # noqa
-from .testutils import Django30CompatibleSimpleTestCase as SimpleTestCase
+from .testutils import BaseTestCase
 
 # isort: on
 
@@ -110,7 +110,7 @@ class CustomClient(Client):
         super().__init__(*args, **kwargs)
 
 
-class TestComponentAsView(SimpleTestCase):
+class TestComponentAsView(BaseTestCase):
     def setUp(self):
         self.client = CustomClient()
 

tests/test_context.py

@@ -6,7 +6,7 @@ from django.test import override_settings
 from django_components import component
 
 from .django_test_setup import *  # NOQA
-from .testutils import Django30CompatibleSimpleTestCase as SimpleTestCase
+from .testutils import BaseTestCase
 
 
 class SimpleComponent(component.Component):
@@ -77,7 +77,7 @@ component.registry.register(name="simple_component", component=SimpleComponent)
 component.registry.register(name="outer_context_component", component=OuterContextComponent)
 
 
-class ContextTests(SimpleTestCase):
+class ContextTests(BaseTestCase):
     def test_nested_component_context_shadows_parent_with_unfilled_slots_and_component_tag(
         self,
     ):
@@ -198,7 +198,7 @@ class ContextTests(SimpleTestCase):
         self.assertNotIn("<h1>Shadowing variable = NOT SHADOWED</h1>", rendered, rendered)
 
 
-class ParentArgsTests(SimpleTestCase):
+class ParentArgsTests(BaseTestCase):
     def test_parent_args_can_be_drawn_from_context(self):
         template = Template(
             "{% load component_tags %}{% component_dependencies %}"
@@ -241,7 +241,7 @@ class ParentArgsTests(SimpleTestCase):
         self.assertNotIn("<h1>Shadowing variable = NOT SHADOWED</h1>", rendered, rendered)
 
 
-class ContextCalledOnceTests(SimpleTestCase):
+class ContextCalledOnceTests(BaseTestCase):
     def test_one_context_call_with_simple_component(self):
         template = Template(
             "{% load component_tags %}{% component_dependencies %}"
@@ -302,7 +302,7 @@ class ContextCalledOnceTests(SimpleTestCase):
         )
 
 
-class ComponentsCanAccessOuterContext(SimpleTestCase):
+class ComponentsCanAccessOuterContext(BaseTestCase):
     def test_simple_component_can_use_outer_context(self):
         template = Template(
             "{% load component_tags %}{% component_dependencies %}"
@@ -312,7 +312,7 @@ class ComponentsCanAccessOuterContext(SimpleTestCase):
         self.assertIn("outer_value", rendered, rendered)
 
 
-class IsolatedContextTests(SimpleTestCase):
+class IsolatedContextTests(BaseTestCase):
     def test_simple_component_can_pass_outer_context_in_args(self):
         template = Template(
             "{% load component_tags %}{% component_dependencies %}"
@@ -330,7 +330,7 @@ class IsolatedContextTests(SimpleTestCase):
         self.assertNotIn("outer_value", rendered, rendered)
 
 
-class IsolatedContextSettingTests(SimpleTestCase):
+class IsolatedContextSettingTests(BaseTestCase):
     def setUp(self):
         self.patcher = patch(
             "django_components.app_settings.AppSettings.CONTEXT_BEHAVIOR",
@@ -385,7 +385,7 @@ class IsolatedContextSettingTests(SimpleTestCase):
         self.assertNotIn("outer_value", rendered, rendered)
 
 
-class OuterContextPropertyTests(SimpleTestCase):
+class OuterContextPropertyTests(BaseTestCase):
     @override_settings(
         COMPONENTS={"context_behavior": "global"},
     )

tests/test_dependency_rendering.py

@@ -9,7 +9,7 @@ from django_components.middleware import ComponentDependencyMiddleware
 
 from .django_test_setup import *  # NOQA
 from .test_templatetags import SimpleComponent
-from .testutils import Django30CompatibleSimpleTestCase as SimpleTestCase
+from .testutils import BaseTestCase
 from .testutils import create_and_process_template_response
 
 
@@ -44,7 +44,7 @@ class MultistyleComponent(component.Component):
 
 
 @override_settings(COMPONENTS={"RENDER_DEPENDENCIES": True})
-class ComponentMediaRenderingTests(SimpleTestCase):
+class ComponentMediaRenderingTests(BaseTestCase):
     def setUp(self):
         # NOTE: component.registry is global, so need to clear before each test
         component.registry.clear()

tests/test_settings.py

@@ -1,10 +1,10 @@
 from django.conf import settings
 
 from .django_test_setup import *  # NOQA
-from .testutils import Django30CompatibleSimpleTestCase as SimpleTestCase
+from .testutils import BaseTestCase
 
 
-class ValidateWrongContextBehaviorValueTestCase(SimpleTestCase):
+class ValidateWrongContextBehaviorValueTestCase(BaseTestCase):
     def setUp(self) -> None:
         settings.COMPONENTS["context_behavior"] = "invalid_value"
         return super().setUp()
@@ -20,7 +20,7 @@ class ValidateWrongContextBehaviorValueTestCase(SimpleTestCase):
             app_settings.CONTEXT_BEHAVIOR
 
 
-class ValidateCorrectContextBehaviorValueTestCase(SimpleTestCase):
+class ValidateCorrectContextBehaviorValueTestCase(BaseTestCase):
     def setUp(self) -> None:
         settings.COMPONENTS["context_behavior"] = "isolated"
         return super().setUp()

tests/test_templatetags.py

@@ -6,7 +6,7 @@ from django.template import Context, Template, TemplateSyntaxError
 
 # isort: off
 from .django_test_setup import *  # NOQA
-from .testutils import Django30CompatibleSimpleTestCase as SimpleTestCase
+from .testutils import BaseTestCase
 
 # isort: on
 
@@ -85,7 +85,7 @@ class ComponentWithDefaultAndRequiredSlot(component.Component):
     template_name = "template_with_default_and_required_slot.html"
 
 
-class ComponentTemplateTagTest(SimpleTestCase):
+class ComponentTemplateTagTest(BaseTestCase):
     def setUp(self):
         # NOTE: component.registry is global, so need to clear before each test
         component.registry.clear()
@@ -202,7 +202,7 @@ class ComponentTemplateTagTest(SimpleTestCase):
             template.render(Context({}))
 
 
-class ComponentSlottedTemplateTagTest(SimpleTestCase):
+class ComponentSlottedTemplateTagTest(BaseTestCase):
     def setUp(self):
         # NOTE: component.registry is global, so need to clear before each test
         component.registry.clear()
@@ -522,7 +522,7 @@ class ComponentSlottedTemplateTagTest(SimpleTestCase):
                 raise e
 
 
-class SlottedTemplateRegressionTests(SimpleTestCase):
+class SlottedTemplateRegressionTests(BaseTestCase):
     def setUp(self):
         # NOTE: component.registry is global, so need to clear before each test
         component.registry.clear()
@@ -565,7 +565,7 @@ class SlottedTemplateRegressionTests(SimpleTestCase):
         )
 
 
-class MultiComponentTests(SimpleTestCase):
+class MultiComponentTests(BaseTestCase):
     def setUp(self):
         component.registry.clear()
 
@@ -623,7 +623,7 @@ class MultiComponentTests(SimpleTestCase):
         self.assertHTMLEqual(rendered, self.expected_result("", second_slot_content))
 
 
-class TemplateInstrumentationTest(SimpleTestCase):
+class TemplateInstrumentationTest(BaseTestCase):
     saved_render_method: Callable  # Assigned during setup.
 
     @classmethod
@@ -685,7 +685,7 @@ class TemplateInstrumentationTest(SimpleTestCase):
         self.assertIn("simple_template.html", templates_used)
 
 
-class NestedSlotTests(SimpleTestCase):
+class NestedSlotTests(BaseTestCase):
     class NestedComponent(component.Component):
         template_name = "nested_slot_template.html"
 
@@ -744,7 +744,7 @@ class NestedSlotTests(SimpleTestCase):
         self.assertHTMLEqual(rendered, "<p>Override</p>")
 
 
-class ConditionalSlotTests(SimpleTestCase):
+class ConditionalSlotTests(BaseTestCase):
     class ConditionalComponent(component.Component):
         template_name = "conditional_template.html"
 
@@ -819,7 +819,7 @@ class ConditionalSlotTests(SimpleTestCase):
         self.assertHTMLEqual(rendered, '<p id="a">Override A</p><p id="b">Override B</p>')
 
 
-class SlotSuperTests(SimpleTestCase):
+class SlotSuperTests(BaseTestCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -906,7 +906,7 @@ class SlotSuperTests(SimpleTestCase):
         )
 
 
-class TemplateSyntaxErrorTests(SimpleTestCase):
+class TemplateSyntaxErrorTests(BaseTestCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -1013,7 +1013,7 @@ class TemplateSyntaxErrorTests(SimpleTestCase):
             ).render(Context({}))
 
 
-class ComponentNestingTests(SimpleTestCase):
+class ComponentNestingTests(BaseTestCase):
     @classmethod
     def setUpClass(cls) -> None:
         super().setUpClass()
@@ -1081,7 +1081,7 @@ class ComponentNestingTests(SimpleTestCase):
         self.assertHTMLEqual(rendered, expected)
 
 
-class ConditionalIfFilledSlotsTests(SimpleTestCase):
+class ConditionalIfFilledSlotsTests(BaseTestCase):
     class ComponentWithConditionalSlots(component.Component):
         template_name = "template_with_conditional_slots.html"
 
@@ -1197,7 +1197,7 @@ class ConditionalIfFilledSlotsTests(SimpleTestCase):
         self.assertHTMLEqual(rendered, expected)
 
 
-class RegressionTests(SimpleTestCase):
+class RegressionTests(BaseTestCase):
     """Ensure we don't break the same thing AGAIN."""
 
     def setUp(self):
@@ -1244,7 +1244,7 @@ class RegressionTests(SimpleTestCase):
         self.assertHTMLEqual(rendered, expected)
 
 
-class IterationFillTest(SimpleTestCase):
+class IterationFillTest(BaseTestCase):
     """Tests a behaviour of {% fill .. %} tag which is inside a template {% for .. %} loop."""
 
     class ComponentSimpleSlotInALoop(django_components.component.Component):

tests/testutils.py

@@ -2,7 +2,7 @@ from unittest.mock import Mock
 
 from django.template import Context
 from django.template.response import TemplateResponse
-from django.test import SimpleTestCase, TestCase
+from django.test import SimpleTestCase
 
 from django_components.middleware import ComponentDependencyMiddleware
 
@@ -11,21 +11,8 @@ response_stash = None
 middleware = ComponentDependencyMiddleware(get_response=lambda _: response_stash)
 
 
-class Django30CompatibleSimpleTestCase(SimpleTestCase):
+# TODO: Use this class to manage component registry cleanup before/after tests.
-    def assertHTMLEqual(self, left, right):
+class BaseTestCase(SimpleTestCase):
-        left = left.replace(' type="text/javascript"', "")
-        left = left.replace(' type="text/css"', "")
-        right = right.replace(' type="text/javascript"', "")
-        right = right.replace(' type="text/css"', "")
-        super(Django30CompatibleSimpleTestCase, self).assertHTMLEqual(left, right)
-
-    def assertInHTML(self, needle, haystack, count=None, msg_prefix=""):
-        haystack = haystack.replace(' type="text/javascript"', "")
-        haystack = haystack.replace(' type="text/css"', "")
-        super().assertInHTML(needle, haystack, count, msg_prefix)
-
-
-class Django30CompatibleTestCase(Django30CompatibleSimpleTestCase, TestCase):
     pass