♻️ Refactor some tests, use injection in more fascinating way

Makefile

@@ -22,4 +22,4 @@ lint-ci:
 	poetry run mypy $(LINT_PATHS)
 
 test:
-	poetry run pytest -p no:warnings
+	poetry run pytest -s

pyproject.toml

@@ -52,4 +52,9 @@ ignore_missing_imports = true
 [tool.ruff]
 select = ["E", "F", "I", "PL"]
 line-length = 100
-target-version = "py311"
+target-version = "py311"
+
+[tool.pytest.ini_options]
+addopts = ["--verbose"]
+pythonpath = ["src", "tests"]
+testpaths = ["tests"]

src/adrpy/injection/modules.py

@@ -1,11 +1,11 @@
-from adrpy.repositories.adr.base import BaseADRRepository
-from adrpy.repositories.adr.repository import ADRFileRepository
-from adrpy.services.template.base import BaseTemplateService
-from adrpy.services.template.service import MakoTemplateService
-from adrpy.shared_kernel.settings import Settings
 from lidipy import Lidi
 
 
 def bind_modules(lidi: Lidi) -> None:
-    lidi.bind(BaseADRRepository, ADRFileRepository(settings=lidi.resolve(Settings)))
+    from adrpy.repositories.adr.base import BaseADRRepository
+    from adrpy.repositories.adr.repository import ADRFileRepository
+    from adrpy.services.template.base import BaseTemplateService
+    from adrpy.services.template.service import MakoTemplateService
+
+    lidi.bind(BaseADRRepository, ADRFileRepository())
     lidi.bind(BaseTemplateService, MakoTemplateService())

src/adrpy/injection/settings.py

@@ -1,6 +1,7 @@
-from adrpy.shared_kernel.settings import Settings
 from lidipy import Lidi
 
 
 def bind_settings(lidi: Lidi) -> None:
+    from adrpy.shared_kernel.settings import Settings
+
     lidi.bind(Settings, Settings(), singleton=True)

src/adrpy/repositories/adr/repository.py

@@ -1,13 +1,13 @@
 import re
 
+from adrpy.injection import lidi
 from adrpy.repositories.adr.base import BaseADRRepository
 from adrpy.shared_kernel.settings import Settings
 from adrpy.shared_kernel.value_objects.template import RenderedTemplate, Template
 
 
 class ADRFileRepository(BaseADRRepository):
-    def __init__(self, settings: Settings) -> None:
-        self.settings = settings
+    settings = lidi.resolve_defer(Settings)
 
     def get_template(self, name: str) -> Template:
         template_path = self.settings.APP_TEMPLATES_DIR / name

tests/conftest.py

@@ -7,7 +7,7 @@
 
 from tests.fixtures.repository import TEST_DIRECTORY
 
-pytest_plugins = ["tests.fixtures"]
+pytest_plugins = ["fixtures.repository"]
 
 
 @pytest.fixture
@@ -19,6 +19,6 @@ def lidi() -> Lidi:
 
 
 @pytest.fixture(autouse=True)
-def remove_test_file() -> Iterator[None]:
+def remove_test_files() -> Iterator[None]:
     yield
     shutil.rmtree(TEST_DIRECTORY, ignore_errors=True)

tests/fixtures/repository.py

@@ -1,3 +1,4 @@
+import dataclasses
 from pathlib import Path
 from typing import Iterator
 
@@ -16,7 +17,7 @@
 def repo_service(lidi: Lidi) -> Iterator[BaseADRRepository]:
     original_repo = lidi.resolve(BaseADRRepository)
     original_settings = lidi.resolve(Settings)
-    new_settings = Settings(initial_adr_dir=TEST_DIRECTORY)
+    new_settings = dataclasses.replace(original_settings, initial_adr_dir=TEST_DIRECTORY)
     lidi.bind(BaseADRRepository, ADRFileRepository(settings=new_settings))
     yield lidi.resolve(BaseADRRepository)
     lidi.bind(BaseADRRepository, original_repo)

tests/integration/repository/implementation/test_adr_file_repository.py

@@ -1,4 +1,6 @@
-from adrpy.repositories.adr.repository import ADRFileRepository, BaseADRRepository
+import dataclasses
+
+from adrpy.repositories.adr.repository import BaseADRRepository
 from adrpy.shared_kernel.constants import AppTemplates
 from adrpy.shared_kernel.settings import Settings
 from adrpy.shared_kernel.value_objects.template import RenderedTemplate
@@ -33,8 +35,8 @@ def test_should_get_template_file(repo_service: BaseADRRepository) -> None:
 def test_should_create_file_in_nested_directories(lidi: Lidi) -> None:
     # Given
     nested_dir = TEST_DIRECTORY / "nested1" / "nested2"
-    new_settings = Settings(initial_adr_dir=nested_dir)
-    lidi.bind(BaseADRRepository, ADRFileRepository(settings=new_settings))
+    new_settings = dataclasses.replace(lidi.resolve(Settings), initial_adr_dir=nested_dir)
+    lidi.bind(Settings, new_settings)
     rendered_template = RenderedTemplate(name=TEST_FILENAME, content="TEST_CONTENT")
 
     # When