refactor: clean duplicate test helpers/fixtures

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: olivermeyer

tests/aignostics_foundry_core/api/auth_test.py

@@ -19,9 +19,7 @@
     require_internal,
     require_internal_admin,
 )
-from aignostics_foundry_core.foundry import reset_context, set_context
 from tests.aignostics_foundry_core.api import AUTH0_ROLE_CLAIM_VAR_NAME, INTERNAL_ORG_ID_VAR_NAME
-from tests.conftest import make_context
 
 _INTERNAL_ORG_ID = "org_internal_123"
 _OTHER_ORG_ID = "org_other_456"
@@ -38,13 +36,11 @@ def _auth_context() -> Generator[None, None, None]:  # pyright: ignore[reportUnu
     Yields:
         None
     """
-    set_context(make_context())
     os.environ[INTERNAL_ORG_ID_VAR_NAME] = _INTERNAL_ORG_ID
     os.environ[AUTH0_ROLE_CLAIM_VAR_NAME] = _TEST_ROLE_CLAIM
     yield
     os.environ.pop(INTERNAL_ORG_ID_VAR_NAME, None)
     os.environ.pop(AUTH0_ROLE_CLAIM_VAR_NAME, None)
-    reset_context()
 
 
 @pytest.mark.unit

tests/aignostics_foundry_core/boot_test.py

@@ -11,7 +11,6 @@
 import pytest
 
 import aignostics_foundry_core.boot as boot_mod
-from aignostics_foundry_core.foundry import set_context
 from tests.conftest import TEST_PROJECT_NAME, TEST_PROJECT_PREFIX, make_context
 
 _OTHER_PROJECT = "otherapp"
@@ -93,7 +92,6 @@ def test_boot_uses_global_context_when_none_provided(monkeypatch: pytest.MonkeyP
     monkeypatch.setattr(boot_mod, "truststore", None)
     monkeypatch.setattr(boot_mod, "certifi", None)
 
-    set_context(make_context())
     boot_mod.boot(sentry_integrations=None)
 
     call_ctx = mock_logging.call_args.kwargs["context"]
@@ -110,7 +108,6 @@ def test_boot_explicit_context_overrides_global(monkeypatch: pytest.MonkeyPatch)
     monkeypatch.setattr(boot_mod, "truststore", None)
     monkeypatch.setattr(boot_mod, "certifi", None)
 
-    set_context(make_context())
     explicit_ctx = make_context(_OTHER_PROJECT)
     boot_mod.boot(context=explicit_ctx, sentry_integrations=None)
 

tests/aignostics_foundry_core/console_test.py

@@ -2,13 +2,12 @@
 
 import importlib
 import sys
-from collections.abc import Generator
 
 import pytest
 from rich.console import Console
 
 from aignostics_foundry_core.console import console
-from aignostics_foundry_core.foundry import reset_context, set_context
+from aignostics_foundry_core.foundry import set_context
 from tests.conftest import make_context
 
 EXPECTED_THEME_KEYS = ["success", "info", "warning", "error", "debug", "logging.level.info"]
@@ -17,18 +16,6 @@
 CONSOLE_MODULE = "aignostics_foundry_core.console"
 
 
-@pytest.fixture(autouse=True)
-def _reset_context() -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
-    """Reset global _context to None before and after every test.
-
-    Yields:
-        None
-    """
-    reset_context()
-    yield
-    reset_context()
-
-
 class TestConsole:
     """Tests for the themed rich console module."""
 

tests/aignostics_foundry_core/database_settings_test.py

@@ -1,6 +1,5 @@
 """Tests for DatabaseSettings."""
 
-from collections.abc import Generator
 from pathlib import Path
 
 import pytest
@@ -28,14 +27,6 @@
 TEST_DB_NAME_ENV = "TEST_DB_NAME"
 
 
-@pytest.fixture(autouse=True)
-def _reset_context() -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
-    """Reset global context before and after every test."""
-    reset_context()
-    yield
-    reset_context()
-
-
 # ---------------------------------------------------------------------------
 # get_url behaviour
 # ---------------------------------------------------------------------------
@@ -201,5 +192,6 @@ def test_database_settings_explicit_env_file_overrides_context(tmp_path: Path) -
 @pytest.mark.integration
 def test_database_settings_no_context_raises_without_prefix() -> None:
     """DatabaseSettings() raises RuntimeError when no context is installed and no prefix is given."""
+    reset_context()
     with pytest.raises(RuntimeError, match="get_context\\(\\) called before set_context"):
         DatabaseSettings()

tests/aignostics_foundry_core/foundry_test.py

@@ -7,7 +7,6 @@
 import subprocess
 import sys
 import textwrap
-from collections.abc import Generator
 from importlib.machinery import ModuleSpec
 from pathlib import Path
 
@@ -109,18 +108,6 @@ def test_from_package_metadata_is_package_metadata_instance() -> None:
     assert ctx.metadata == PackageMetadata.from_name(PACKAGE_NAME)
 
 
-@pytest.fixture(autouse=True)
-def _reset_context() -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
-    """Reset global _context to None before and after every test.
-
-    Yields:
-        None
-    """
-    reset_context()
-    yield
-    reset_context()
-
-
 # ---------------------------------------------------------------------------
 # from_package — name and version
 # ---------------------------------------------------------------------------
@@ -471,6 +458,7 @@ def test_set_context_makes_context_accessible() -> None:
 @pytest.mark.unit
 def test_context_raises_before_set_context() -> None:
     """get_context() before set_context() raises RuntimeError."""
+    reset_context()
     with pytest.raises(RuntimeError, match=ERROR_MSG_FRAGMENT):
         get_context()
 

tests/aignostics_foundry_core/gui/conftest.py

@@ -0,0 +1,30 @@
+"""Shared fixtures for GUI tests."""
+
+import os
+from collections.abc import Generator
+
+import pytest
+
+from aignostics_foundry_core.gui import clear_page_registry
+from tests.aignostics_foundry_core.api import AUTH0_ROLE_CLAIM_VAR_NAME, INTERNAL_ORG_ID_VAR_NAME
+
+_INTERNAL_ORG = "org_internal"
+_ROLE_CLAIM = "https://example.com/role"
+
+
+@pytest.fixture(autouse=True)
+def _clear_registry() -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
+    """Ensure the page registry is clean before and after each test."""
+    clear_page_registry()
+    yield
+    clear_page_registry()
+
+
+@pytest.fixture(autouse=True)
+def _gui_auth_context() -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
+    """Set required AuthSettings environment variables for GUI auth tests."""
+    os.environ[INTERNAL_ORG_ID_VAR_NAME] = _INTERNAL_ORG
+    os.environ[AUTH0_ROLE_CLAIM_VAR_NAME] = _ROLE_CLAIM
+    yield
+    os.environ.pop(INTERNAL_ORG_ID_VAR_NAME, None)
+    os.environ.pop(AUTH0_ROLE_CLAIM_VAR_NAME, None)

tests/aignostics_foundry_core/gui/gui_test.py

@@ -1,17 +1,14 @@
 """Tests for aignostics_foundry_core.gui.*."""
 
 import asyncio
-import os
 import sys
 import time
-from collections.abc import Generator
 from contextlib import contextmanager
 from types import SimpleNamespace
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
-from aignostics_foundry_core.foundry import reset_context, set_context
 from aignostics_foundry_core.gui.core import (
     BROWSER_RECONNECT_TIMEOUT,
     RESPONSE_TIMEOUT,
@@ -25,7 +22,6 @@
     NavItem,
     gui_get_nav_groups,
 )
-from tests.aignostics_foundry_core.api import AUTH0_ROLE_CLAIM_VAR_NAME, INTERNAL_ORG_ID_VAR_NAME
 from tests.conftest import TEST_PROJECT_NAME, make_context
 
 _PATCH_GET_GUI_USER = "aignostics_foundry_core.gui.auth.get_gui_user"
@@ -34,9 +30,7 @@
 _PATH_CORE_LOCATE = "aignostics_foundry_core.gui.core.locate_subclasses"
 
 _TEST_PATH = "/test-page"
-_INTERNAL_ORG = "org_internal"
 _OTHER_ORG = "org_other"
-_ROLE_CLAIM = "https://example.com/role"
 _FIXED_PORT = 9000
 _DOCS_PATH = "/docs"
 _USER_SUB = "auth0|x"
@@ -248,15 +242,6 @@ def test_browser_reconnect_timeout_is_long(self) -> None:
 class TestGuiRegisterPages:
     """Tests for gui_register_pages behaviour."""
 
-    @pytest.fixture(autouse=True)
-    def _clear_registry(self) -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
-        """Ensure the page registry is clean before and after each test."""
-        from aignostics_foundry_core.gui import clear_page_registry
-
-        clear_page_registry()
-        yield
-        clear_page_registry()
-
     def test_calls_register_pages_on_each_builder(self) -> None:
         """gui_register_pages calls register_pages() on every discovered builder."""
         builder_a = MagicMock(spec=BasePageBuilder)
@@ -463,17 +448,6 @@ def test_gui_register_pages_called(self) -> None:
 class TestGetGuiUser:
     """Tests for get_gui_user behaviour."""
 
-    @pytest.fixture(autouse=True)
-    def _gui_context(self) -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
-        """Install a minimal context and required AuthSettings env vars."""
-        set_context(make_context())
-        os.environ[INTERNAL_ORG_ID_VAR_NAME] = _INTERNAL_ORG
-        os.environ[AUTH0_ROLE_CLAIM_VAR_NAME] = _ROLE_CLAIM
-        yield
-        os.environ.pop(INTERNAL_ORG_ID_VAR_NAME, None)
-        os.environ.pop(AUTH0_ROLE_CLAIM_VAR_NAME, None)
-        reset_context()
-
     async def test_returns_none_when_auth_client_raises(self) -> None:
         """Returns None when get_auth_client raises (no auth configured)."""
         from aignostics_foundry_core.gui.auth import get_gui_user
@@ -549,17 +523,6 @@ async def test_returns_none_when_session_has_no_user_key(self) -> None:
 class TestRequireGuiUser:
     """Tests for require_gui_user behaviour."""
 
-    @pytest.fixture(autouse=True)
-    def _gui_context(self) -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
-        """Install a minimal context and required AuthSettings env vars."""
-        set_context(make_context())
-        os.environ[INTERNAL_ORG_ID_VAR_NAME] = _INTERNAL_ORG
-        os.environ[AUTH0_ROLE_CLAIM_VAR_NAME] = _ROLE_CLAIM
-        yield
-        os.environ.pop(INTERNAL_ORG_ID_VAR_NAME, None)
-        os.environ.pop(AUTH0_ROLE_CLAIM_VAR_NAME, None)
-        reset_context()
-
     async def test_redirects_to_login_when_no_user(self) -> None:
         """Redirects to /auth/login when get_gui_user returns None."""
         from aignostics_foundry_core.gui.auth import require_gui_user
@@ -635,22 +598,6 @@ def _make_nicegui_mock() -> tuple[MagicMock, MagicMock]:
 class TestPageRegistryDecorators:
     """Tests for page_* registry decorators (deferred registration)."""
 
-    @pytest.fixture(autouse=True)
-    def _clear_registry(self) -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
-        """Ensure registry is clean before and after each test."""
-        from aignostics_foundry_core.gui import clear_page_registry
-
-        clear_page_registry()
-        yield
-        clear_page_registry()
-
-    @pytest.fixture(autouse=True)
-    def _context(self) -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
-        """Install a minimal FoundryContext so get_context() works inside page wrappers."""
-        set_context(make_context())
-        yield
-        reset_context()
-
     def _actualize_via_register_pages(self, frame_func: object = None) -> tuple[list[object], MagicMock]:
         """Run gui_register_pages and return (wrappers, nicegui_mock).
 
@@ -909,13 +856,6 @@ def my_page(user: object) -> None: ...
 class TestGUINamespace:
     """Tests for GUINamespace and the gui singleton."""
 
-    @pytest.fixture(autouse=True)
-    def _context(self) -> Generator[None, None, None]:  # pyright: ignore[reportUnusedFunction]
-        """Install a minimal FoundryContext so get_context() works inside page wrappers."""
-        set_context(make_context())
-        yield
-        reset_context()
-
     def test_gui_exposes_all_decorator_methods(self) -> None:
         """The gui singleton exposes all page decorator methods as callables."""
         from aignostics_foundry_core.gui.auth import gui

tests/aignostics_foundry_core/log_test.py

@@ -8,7 +8,7 @@
 from pydantic import ValidationError
 
 from aignostics_foundry_core.log import InterceptHandler, LogSettings, logging_initialize
-from tests.conftest import TEST_PROJECT_PREFIX, make_context
+from tests.conftest import TEST_PROJECT_PREFIX
 
 _MARKER_MESSAGE = "log_test_unique_marker_4f2a"
 _STDLIB_MESSAGE = "stdlib_redirect_unique_marker_9b3c"
@@ -23,13 +23,6 @@
 class TestLoggingInitialize:
     """Behavioural tests for logging_initialize()."""
 
-    @pytest.fixture(autouse=True)
-    def _stub_get_context(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        monkeypatch.setattr(
-            "aignostics_foundry_core.log.get_context",
-            make_context,
-        )
-
     def test_logging_initialize_adds_stderr_handler(self, capsys: pytest.CaptureFixture[str]) -> None:
         """After initialization with defaults, a log message appears on stderr."""
         logging_initialize()
@@ -117,10 +110,6 @@ def test_logging_initialize_respects_env_prefix_from_context(
         self, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
     ) -> None:
         """LogSettings reads env vars from the prefix of the active get_context()."""
-        monkeypatch.setattr(
-            "aignostics_foundry_core.log.get_context",
-            make_context,
-        )
         monkeypatch.setenv(f"{TEST_PROJECT_PREFIX}LOG_STDERR_ENABLED", "false")
         logging_initialize()
         from loguru import logger
@@ -133,20 +122,9 @@ def test_logging_initialize_respects_env_prefix_from_context(
 class TestLogSettings:
     """Behavioural tests for LogSettings validation."""
 
-    @pytest.fixture(autouse=True)
-    def _stub_get_context(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        monkeypatch.setattr(
-            "aignostics_foundry_core.log.get_context",
-            make_context,
-        )
-
     @pytest.mark.unit
     def test_log_settings_uses_context_env_prefix(self, monkeypatch: pytest.MonkeyPatch) -> None:
         """LogSettings reads env vars using the env_prefix from the active FoundryContext."""
-        monkeypatch.setattr(
-            "aignostics_foundry_core.log.get_context",
-            make_context,
-        )
         monkeypatch.setenv(f"{TEST_PROJECT_PREFIX}LOG_STDERR_ENABLED", "false")
         settings = LogSettings()  # pyright: ignore[reportCallIssue]
         assert settings.stderr_enabled is False