tests/cli(refactor[typing]): Tighten config fixture types

why: Make CLI test fixtures and plan helper kwargs type-safe for better mypy coverage.

what:

- Add explicit config structure aliases in CLI tests

- Use a TypedDict for PlanEntry kwargs and a typed subprocess args alias

Author: tony

tests/cli/test_add.py

@@ -22,6 +22,9 @@
     from syrupy.assertion import SnapshotAssertion
 
 
+ConfigData: t.TypeAlias = dict[str, dict[str, dict[str, str]]]
+
+
 class AddRepoFixture(t.NamedTuple):
     """Fixture for add repo test cases."""
 
@@ -32,8 +35,8 @@ class AddRepoFixture(t.NamedTuple):
     path_relative: str | None
     dry_run: bool
     use_default_config: bool
-    preexisting_config: dict[str, t.Any] | None
-    expected_in_config: dict[str, t.Any]
+    preexisting_config: ConfigData | None
+    expected_in_config: ConfigData
     expected_log_messages: list[str]
 
 
@@ -169,8 +172,8 @@ def test_add_repo(
     path_relative: str | None,
     dry_run: bool,
     use_default_config: bool,
-    preexisting_config: dict[str, t.Any] | None,
-    expected_in_config: dict[str, t.Any],
+    preexisting_config: ConfigData | None,
+    expected_in_config: ConfigData,
     expected_log_messages: list[str],
     tmp_path: pathlib.Path,
     monkeypatch: MonkeyPatch,

tests/cli/test_discover.py

@@ -41,7 +41,7 @@ class DiscoverFixture(t.NamedTuple):
     yes: bool
     expected_repo_count: int
     config_relpath: str | None
-    preexisting_config: dict[str, t.Any] | None
+    preexisting_config: dict[str, object] | None
     user_input: str | None
     expected_workspace_labels: set[str] | None
     merge_duplicates: bool
@@ -352,7 +352,7 @@ def test_discover_repos(
     yes: bool,
     expected_repo_count: int,
     config_relpath: str | None,
-    preexisting_config: dict[str, t.Any] | None,
+    preexisting_config: dict[str, object] | None,
     user_input: str | None,
     expected_workspace_labels: set[str] | None,
     merge_duplicates: bool,
@@ -785,9 +785,9 @@ def test_discover_normalization_only_save(
     config_file = tmp_path / ".vcspull.yaml"
     config_file.write_text(yaml.dump(preexisting_config), encoding="utf-8")
 
-    save_calls: list[tuple[pathlib.Path, dict[str, t.Any]]] = []
+    save_calls: list[tuple[pathlib.Path, dict[str, object]]] = []
 
-    def _fake_save(path: pathlib.Path, data: dict[str, t.Any]) -> None:
+    def _fake_save(path: pathlib.Path, data: dict[str, object]) -> None:
         save_calls.append((path, data))
 
     monkeypatch.setattr("vcspull.cli.discover.save_config_yaml", _fake_save)
@@ -978,7 +978,7 @@ def test_discover_skips_non_dict_workspace(
         encoding="utf-8",
     )
 
-    def _fail_save(path: pathlib.Path, data: dict[str, t.Any]) -> None:
+    def _fail_save(path: pathlib.Path, data: dict[str, object]) -> None:
         error_message = "save_config_yaml should not be called when skipping repo"
         raise AssertionError(error_message)
 

tests/cli/test_list.py

@@ -16,7 +16,10 @@
     from _pytest.monkeypatch import MonkeyPatch
 
 
-def create_test_config(config_path: pathlib.Path, repos: dict[str, t.Any]) -> None:
+ConfigData: t.TypeAlias = dict[str, dict[str, dict[str, str]]]
+
+
+def create_test_config(config_path: pathlib.Path, repos: ConfigData) -> None:
     """Create a test config file."""
     with config_path.open("w", encoding="utf-8") as f:
         yaml.dump(repos, f)
@@ -26,7 +29,7 @@ class ListReposFixture(t.NamedTuple):
     """Fixture for list repos test cases."""
 
     test_id: str
-    config_data: dict[str, t.Any]
+    config_data: ConfigData
     patterns: list[str]
     tree: bool
     output_json: bool
@@ -122,7 +125,7 @@ class ListReposFixture(t.NamedTuple):
 )
 def test_list_repos(
     test_id: str,
-    config_data: dict[str, t.Any],
+    config_data: ConfigData,
     patterns: list[str],
     tree: bool,
     output_json: bool,

tests/cli/test_plan_output_helpers.py

@@ -8,6 +8,7 @@
 from contextlib import redirect_stdout
 
 import pytest
+import typing_extensions as te
 
 from vcspull.cli._colors import ColorMode, Colors
 from vcspull.cli._output import (
@@ -21,12 +22,32 @@
 from vcspull.cli.sync import PlanProgressPrinter
 
 
+class PlanEntryKwargs(t.TypedDict):
+    """Typed kwargs for PlanEntry construction in tests."""
+
+    name: str
+    path: str
+    workspace_root: str
+    action: PlanAction
+    detail: te.NotRequired[str]
+    url: te.NotRequired[str]
+    branch: te.NotRequired[str]
+    remote_branch: te.NotRequired[str]
+    current_rev: te.NotRequired[str]
+    target_rev: te.NotRequired[str]
+    ahead: te.NotRequired[int]
+    behind: te.NotRequired[int]
+    dirty: te.NotRequired[bool]
+    error: te.NotRequired[str]
+    diagnostics: te.NotRequired[list[str]]
+
+
 class PlanEntryPayloadFixture(t.NamedTuple):
     """Fixture for PlanEntry payload serialization."""
 
     test_id: str
-    kwargs: dict[str, t.Any]
-    expected_keys: dict[str, t.Any]
+    kwargs: PlanEntryKwargs
+    expected_keys: dict[str, object]
     unexpected_keys: set[str]
 
 
@@ -86,14 +107,14 @@ class PlanEntryPayloadFixture(t.NamedTuple):
 )
 def test_plan_entry_to_payload(
     test_id: str,
-    kwargs: dict[str, t.Any],
-    expected_keys: dict[str, t.Any],
+    kwargs: PlanEntryKwargs,
+    expected_keys: dict[str, object],
     unexpected_keys: set[str],
 ) -> None:
     """Ensure PlanEntry serialises optional fields correctly."""
     entry = PlanEntry(**kwargs)
     payload = entry.to_payload()
-    payload_map = t.cast(dict[str, t.Any], payload)
+    payload_map = t.cast(dict[str, object], payload)
 
     for key, value in expected_keys.items():
         assert payload_map[key] == value

tests/cli/test_status.py

@@ -25,7 +25,10 @@
     from vcspull.types import ConfigDict
 
 
-def create_test_config(config_path: pathlib.Path, repos: dict[str, t.Any]) -> None:
+ConfigData: t.TypeAlias = dict[str, dict[str, dict[str, str]]]
+
+
+def create_test_config(config_path: pathlib.Path, repos: ConfigData) -> None:
     """Create a test config file."""
     with config_path.open("w", encoding="utf-8") as f:
         yaml.dump(repos, f)

tests/cli/test_sync_plan_helpers.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import collections.abc as cabc
+import os
 import subprocess
 import typing as t
 
@@ -17,6 +19,13 @@
 
 
 StatusOverride: t.TypeAlias = dict[str, bool | int | None]
+CompletedProcessArgs: t.TypeAlias = (
+    str
+    | bytes
+    | os.PathLike[str]
+    | os.PathLike[bytes]
+    | cabc.Sequence[str | bytes | os.PathLike[str] | os.PathLike[bytes]]
+)
 
 
 def _build_status(overrides: StatusOverride) -> StatusResult:
@@ -132,8 +141,8 @@ def test_maybe_fetch_behaviour(
     if subprocess_behavior:
 
         def _patched_run(
-            *args: t.Any,
-            **kwargs: t.Any,
+            args: CompletedProcessArgs,
+            **kwargs: object,
         ) -> subprocess.CompletedProcess[str]:
             if subprocess_behavior == "file-not-found":
                 error_message = "git executable not found"
@@ -143,13 +152,13 @@ def _patched_run(
                 raise OSError(error_message)
             if subprocess_behavior == "non-zero":
                 return subprocess.CompletedProcess(
-                    args=args[0],
+                    args=args,
                     returncode=1,
                     stdout="",
                     stderr="remote rejected",
                 )
             return subprocess.CompletedProcess(
-                args=args[0],
+                args=args,
                 returncode=0,
                 stdout="",
                 stderr="",