refactor

tests/test_service_dotfiles.py

@@ -1,18 +1,28 @@
 """Tests for DotfilesService."""
 
+import subprocess
 from pathlib import Path
-from unittest.mock import MagicMock
 
 import yaml
 
 from flow.core.config import AppConfig, FlowContext
 from flow.core.console import Console
 from flow.core.platform import PlatformInfo
-from flow.core.runtime import SystemRuntime
+from flow.core.runtime import CommandRunner, SystemRuntime
 from flow.core import paths
 from flow.services.dotfiles import DotfilesService
 
 
+class FakeRunner(CommandRunner):
+    def __init__(self):
+        self.calls: list[list[str]] = []
+
+    def run(self, argv, *, cwd=None, env=None, capture_output=True, check=False, timeout=None):
+        command = [str(part) for part in argv]
+        self.calls.append(command)
+        return subprocess.CompletedProcess(command, 0, stdout="", stderr="")
+
+
 def _make_ctx(tmp_path, console=None):
     """Build a FlowContext for testing."""
     return FlowContext(
@@ -170,3 +180,59 @@ class TestDotfilesServiceLink:
         svc.status()
         output = capsys.readouterr().out
         assert "zsh" in output
+
+    def test_relink_does_not_remove_unmanaged_file(self, tmp_path, monkeypatch):
+        home = tmp_path / "home"
+        home.mkdir()
+
+        dotfiles = _setup_dotfiles(tmp_path, {
+            "zsh": {".zshrc": "# zsh"},
+        })
+
+        monkeypatch.setattr(paths, "HOME", home)
+        monkeypatch.setattr(paths, "DOTFILES_DIR", dotfiles)
+        monkeypatch.setattr(paths, "MODULES_DIR", tmp_path / "modules")
+        monkeypatch.setattr(paths, "LINKED_STATE", tmp_path / "state" / "linked.json")
+
+        ctx = _make_ctx(tmp_path)
+        svc = DotfilesService(ctx)
+        svc.link()
+
+        target = home / ".zshrc"
+        target.unlink()
+        target.write_text("user managed file")
+
+        svc.link()
+        assert target.read_text() == "user managed file"
+        assert not target.is_symlink()
+
+    def test_sync_modules_includes_profile_layers(self, tmp_path, monkeypatch):
+        home = tmp_path / "home"
+        home.mkdir()
+        dotfiles = tmp_path / "dotfiles"
+        profile_pkg = dotfiles / "linux-work" / "nvim" / ".config" / "nvim"
+        profile_pkg.mkdir(parents=True)
+        (profile_pkg / "_module.yaml").write_text(yaml.dump({
+            "source": "github:test/nvim-config",
+            "ref": {"branch": "main"},
+        }))
+
+        monkeypatch.setattr(paths, "HOME", home)
+        monkeypatch.setattr(paths, "DOTFILES_DIR", dotfiles)
+        monkeypatch.setattr(paths, "MODULES_DIR", tmp_path / "modules")
+        monkeypatch.setattr(paths, "LINKED_STATE", tmp_path / "state" / "linked.json")
+
+        runtime = SystemRuntime()
+        runner = FakeRunner()
+        runtime.runner = runner
+        runtime.git.runner = runner
+        ctx = FlowContext(
+            config=AppConfig(),
+            manifest={},
+            platform=PlatformInfo(),
+            console=Console(color=False),
+            runtime=runtime,
+        )
+
+        DotfilesService(ctx).sync_modules()
+        assert any("linux-work--nvim" in " ".join(call) for call in runner.calls)