move test utils

Author: joshuadavidthomas

tests/conftest.py

@@ -3,10 +3,7 @@
 import contextlib
 import logging
 import re
-from dataclasses import dataclass
-from dataclasses import field
 from pathlib import Path
-from typing import Any
 
 import pytest
 from django.conf import settings
@@ -15,8 +12,6 @@
 from django.template.engine import Engine
 from django.test import override_settings
 
-from django_bird.staticfiles import AssetType
-
 from .settings import DEFAULT_SETTINGS
 
 pytest_plugins = []
@@ -89,63 +84,6 @@ def _override_app_settings(**kwargs):
     return _override_app_settings
 
 
-@dataclass
-class TestComponent:
-    name: str
-    content: str
-    file: Path | None = None
-    parent_dir: str = "bird"
-    sub_dir: str | None = None
-
-    def create(self, base_dir: Path) -> TestComponent:
-        parent = base_dir / self.parent_dir
-        parent.mkdir(exist_ok=True)
-
-        if self.sub_dir is not None:
-            dir = parent / self.sub_dir
-            dir.mkdir(exist_ok=True)
-        else:
-            dir = parent
-
-        template = dir / f"{self.name}.html"
-        template.write_text(self.content)
-
-        self.file = template
-
-        return self
-
-
-@dataclass
-class TestAsset:
-    component: TestComponent
-    content: str
-    asset_type: AssetType
-    file: Path | None = None
-
-    def create(self) -> TestAsset:
-        if self.component.file is None:
-            raise ValueError("Component must be created before adding assets")
-
-        component_dir = self.component.file.parent
-        component_name = self.component.file.stem
-
-        asset_file = component_dir / f"{component_name}{self.asset_type.ext}"
-        asset_file.write_text(self.content)
-
-        self.file = asset_file
-
-        return self
-
-
-@dataclass
-class TestComponentCase:
-    component: TestComponent
-    template_content: str
-    expected: str
-    description: str = ""
-    template_context: dict[str, Any] = field(default_factory=dict)
-
-
 @pytest.fixture
 def create_template():
     def _create_template(template_file: Path) -> DjangoTemplate:

tests/templatetags/test_asset.py

@@ -12,8 +12,8 @@
 from django_bird.templatetags.tags.asset import JS_TAG
 from django_bird.templatetags.tags.asset import AssetNode
 from django_bird.templatetags.tags.asset import do_asset
-from tests.conftest import TestAsset
-from tests.conftest import TestComponent
+from tests.utils import TestAsset
+from tests.utils import TestComponent
 
 
 class TestTemplateTag:

tests/templatetags/test_bird.py

@@ -18,8 +18,8 @@
 from django_bird.templatetags.tags.bird import TAG
 from django_bird.templatetags.tags.bird import BirdNode
 from django_bird.templatetags.tags.bird import do_bird
-from tests.conftest import TestComponent
-from tests.conftest import TestComponentCase
+from tests.utils import TestComponent
+from tests.utils import TestComponentCase
 
 
 class TestTagParsing:

tests/templatetags/test_slot.py

@@ -6,8 +6,8 @@
 from django.template.exceptions import TemplateSyntaxError
 
 from django_bird.templatetags.tags.slot import parse_slot_name
-from tests.conftest import TestComponent
-from tests.conftest import TestComponentCase
+from tests.utils import TestComponent
+from tests.utils import TestComponentCase
 
 
 @pytest.mark.parametrize(

tests/test_apps.py

@@ -3,7 +3,8 @@
 from django.apps import apps
 
 from django_bird.components import components
-from tests.conftest import TestComponent
+
+from .utils import TestComponent
 
 
 def test_ready_scans_components(templates_dir):

tests/test_fixtures.py

@@ -3,7 +3,7 @@
 import pytest
 from django.template.loader import get_template
 
-from tests.conftest import TestComponent
+from .utils import TestComponent
 
 
 def test_test_component(templates_dir):

tests/test_integration.py

@@ -7,8 +7,9 @@
 
 from django_bird.components import components
 from django_bird.staticfiles import AssetType
-from tests.conftest import TestAsset
-from tests.conftest import TestComponent
+
+from .utils import TestAsset
+from .utils import TestComponent
 
 
 @contextmanager

tests/test_loader.py

@@ -13,8 +13,9 @@
 from django_bird.loader import BirdLoader
 from django_bird.staticfiles import AssetType
 from django_bird.templatetags.tags.bird import BirdNode
-from tests.conftest import TestAsset
-from tests.conftest import TestComponent
+
+from .utils import TestAsset
+from .utils import TestComponent
 
 
 @pytest.mark.parametrize(

tests/utils.py

@@ -0,0 +1,71 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from dataclasses import field
+from pathlib import Path
+from typing import Any
+
+from django_bird.staticfiles import AssetType
+
+
+@dataclass
+class TestComponent:
+    __test__ = False
+
+    name: str
+    content: str
+    file: Path | None = None
+    parent_dir: str = "bird"
+    sub_dir: str | None = None
+
+    def create(self, base_dir: Path) -> TestComponent:
+        parent = base_dir / self.parent_dir
+        parent.mkdir(exist_ok=True)
+
+        if self.sub_dir is not None:
+            dir = parent / self.sub_dir
+            dir.mkdir(exist_ok=True)
+        else:
+            dir = parent
+
+        template = dir / f"{self.name}.html"
+        template.write_text(self.content)
+
+        self.file = template
+
+        return self
+
+
+@dataclass
+class TestAsset:
+    __test__ = False
+
+    component: TestComponent
+    content: str
+    asset_type: AssetType
+    file: Path | None = None
+
+    def create(self) -> TestAsset:
+        if self.component.file is None:
+            raise ValueError("Component must be created before adding assets")
+
+        component_dir = self.component.file.parent
+        component_name = self.component.file.stem
+
+        asset_file = component_dir / f"{component_name}{self.asset_type.ext}"
+        asset_file.write_text(self.content)
+
+        self.file = asset_file
+
+        return self
+
+
+@dataclass
+class TestComponentCase:
+    __test__ = False
+
+    component: TestComponent
+    template_content: str
+    expected: str
+    description: str = ""
+    template_context: dict[str, Any] = field(default_factory=dict)