!squash more

Author: tony

tests/cli/test_add_from_fs.py

@@ -10,6 +10,7 @@
 import yaml
 
 from vcspull.cli.add_from_fs import add_from_filesystem, get_git_origin_url
+from vcspull.tests.helpers import save_config_yaml
 
 if t.TYPE_CHECKING:
     from _pytest.logging import LogCaptureFixture
@@ -524,55 +525,124 @@ def test_add_from_fs_base_dir_key_not_dict(
     assert data == initial_config_data
 
 
-# Next: Integration style test with libvcs create_git_remote_repo
-@pytest.mark.skip(
-    reason="libvcs pytest plugin not available in this test environment yet",
-)
+# @pytest.mark.skip(
+#     reason="libvcs pytest plugin not available in this test environment yet"
+# )
 def test_add_from_fs_integration_with_libvcs(
-    # create_git_remote_repo, # This fixture would come from libvcs.pytest_plugin
-    tmp_path: pathlib.Path,  # Using tmp_path for manual git setup for now
-    cwd_path_fs: pathlib.Path,  # Mocked CWD
-    mock_find_home_config_files_fs: t.Any,
+    tmp_path: pathlib.Path,
+    cwd_path_fs: pathlib.Path,  # Mocked CWD, ensures config saved in predictable temp loc
+    mock_find_home_config_files_fs: t.Any,  # To control config loading behavior
     caplog: LogCaptureFixture,
+    # git_commit_envvars: t.Mapping[str, str], # from libvcs if making commits
 ) -> None:
-    """Test add_from_filesystem with actual git repositories created by libvcs (or manually)."""
-    mock_find_home_config_files_fs.return_value = []
-    scan_dir = cwd_path_fs / "integration_scan"
-    scan_dir.mkdir(exist_ok=True)
-    config_file = cwd_path_fs / ".vcspull.yaml"
+    """Test add_from_filesystem with actual git repos on the filesystem.
 
-    # Manually create a git repo as libvcs fixture is not directly usable here
-    repo1_path = scan_dir / "actual_repo1"
-    repo1_path.mkdir()
-    repo1_url = "https://gitserver.com/user/actual_repo1.git"
-    try:
-        subprocess.run(["git", "init"], cwd=repo1_path, check=True, capture_output=True)
-        subprocess.run(
-            ["git", "remote", "add", "origin", repo1_url],
-            cwd=repo1_path,
-            check=True,
-            capture_output=True,
-        )
-    except (subprocess.CalledProcessError, FileNotFoundError) as e:
-        pytest.skip(f"git CLI not available or failed to init repo: {e}")
+    This test does not mock os.walk or get_git_origin_url.
+    It relies on conftest.py to set up a clean git environment (home, gitconfig).
+    """
+    mock_find_home_config_files_fs.return_value = []  # Default to CWD config
+    config_file_path = cwd_path_fs / ".vcspull.yaml"
+
+    scan_dir = tmp_path / "actual_projects_integration"
+    scan_dir.mkdir()
+
+    # Repo 1: project_one
+    repo1_url = "https://example.com/integration/project_one.git"
+    repo1_name = "project_one"
+    repo1_dir = scan_dir / repo1_name
+    repo1_dir.mkdir()
+    # Environment for subprocess.run should be clean thanks to libvcs fixtures in conftest
+    subprocess.run(
+        ["git", "init"],
+        cwd=repo1_dir,
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+    subprocess.run(
+        ["git", "remote", "add", "origin", repo1_url],
+        cwd=repo1_dir,
+        check=True,
+        capture_output=True,
+        text=True,
+    )
 
-    expected_base_key = str(scan_dir.resolve()) + "/"
+    # Repo 2: project_two (nested)
+    repo2_url = "git@example.com:integration/project_two.git"
+    repo2_name = "project_two"
+    nested_dir = scan_dir / "nested_group"
+    nested_dir.mkdir()
+    repo2_dir = nested_dir / repo2_name
+    repo2_dir.mkdir()
+    subprocess.run(
+        ["git", "init"],
+        cwd=repo2_dir,
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+    subprocess.run(
+        ["git", "remote", "add", "origin", repo2_url],
+        cwd=repo2_dir,
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+
+    # Repo 3: project_three (no remote)
+    repo3_name = "project_three"
+    repo3_dir = scan_dir / repo3_name
+    repo3_dir.mkdir()
+    subprocess.run(
+        ["git", "init"],
+        cwd=repo3_dir,
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+
+    # Repo 4: not_a_git_repo
+    not_a_repo_dir = scan_dir / "not_a_git_repo"
+    not_a_repo_dir.mkdir()
+    (not_a_repo_dir / "some_file.txt").write_text("hello")
 
     add_from_filesystem(
         scan_dir_str=str(scan_dir),
-        config_file_path_str=None,
+        config_file_path_str=None,  # Uses default (cwd_path_fs / ".vcspull.yaml")
         recursive=True,
-        base_dir_key_arg=None,
-        yes=True,
+        base_dir_key_arg=None,  # Infer
+        yes=True,  # Auto-confirm
     )
 
+    assert config_file_path.exists()
+    with open(config_file_path, encoding="utf-8") as f:
+        data = yaml.safe_load(f)
+
+    expected_base_key = str(scan_dir.resolve()) + "/"
+
+    assert expected_base_key in data
+    assert repo1_name in data[expected_base_key]
+    assert data[expected_base_key][repo1_name] == repo1_url
+
+    assert repo2_name in data[expected_base_key]
+    assert data[expected_base_key][repo2_name] == repo2_url
+
+    assert repo3_name not in data[expected_base_key]  # No remote
+    assert "not_a_git_repo" not in data[expected_base_key]
+
+    assert f"Found .git in {repo1_dir}" in caplog.text
+    assert f"Found .git in {repo2_dir}" in caplog.text
+    assert f"Found .git in {repo3_dir}" in caplog.text
+    assert f"Could not get origin URL for {repo3_dir}" in caplog.text
     assert (
-        f"Adding 'actual_repo1' ({repo1_url}) under '{expected_base_key}'"
+        f"Adding '{repo1_name}' ({repo1_url}) under '{expected_base_key}'"
         in caplog.text
     )
-    with open(config_file, encoding="utf-8") as f:
-        data = yaml.safe_load(f)
-    assert data[expected_base_key]["actual_repo1"] == repo1_url
+    assert (
+        f"Adding '{repo2_name}' ({repo2_url}) under '{expected_base_key}'"
+        in caplog.text
+    )
+    assert f"Successfully updated {config_file_path}" in caplog.text
 
 
 # - scan_dir being relative to a mocked home directory for key generation