From 112e0125defacba3fcd59cd5f8949b77746264bc Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 20 Jul 2026 03:48:11 +0900 Subject: fix(git-downloader): un-ignore test_remove via FilesystemMock path seam The ignore reason went stale: the FilesystemMock seam added for FileDownloaderTest already intercepts removeDirectoryAsync, and the sibling fossil/hg testRemove ports use it. The seam now records the removed directories instead of a bare call count so the PHP ->with($this->equalTo($this->workingDir)) argument assertion can be reproduced faithfully. Co-Authored-By: Claude Fable 5 --- crates/shirabe/src/util/filesystem.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/util') diff --git a/crates/shirabe/src/util/filesystem.rs b/crates/shirabe/src/util/filesystem.rs index 3516b284..51885cc3 100644 --- a/crates/shirabe/src/util/filesystem.rs +++ b/crates/shirabe/src/util/filesystem.rs @@ -27,9 +27,9 @@ pub struct Filesystem { /// Test-only seam mirroring the PHP FileDownloaderTest mock of `Filesystem`. #[derive(Debug, Default)] pub struct FilesystemMock { - /// When `Some`, `remove_directory_async` returns it without touching disk and counts the call. + /// When `Some`, `remove_directory_async` returns it without touching disk and records the call. pub remove_directory_async_result: Option, - pub remove_directory_async_calls: usize, + pub remove_directory_async_paths: Vec, /// When true, `normalize_path` returns its argument unchanged. pub normalize_path_identity: bool, } @@ -49,10 +49,16 @@ impl Filesystem { /// For testing only: number of `remove_directory_async` calls intercepted by the seam. pub fn __remove_directory_async_calls(&self) -> usize { + self.__remove_directory_async_paths().len() + } + + /// For testing only: the directories passed to `remove_directory_async` calls intercepted by + /// the seam, in call order (ref PHPUnit's `->with($this->equalTo($this->workingDir))`). + pub fn __remove_directory_async_paths(&self) -> Vec { self.mock .as_ref() - .map(|m| m.remove_directory_async_calls) - .unwrap_or(0) + .map(|m| m.remove_directory_async_paths.clone()) + .unwrap_or_default() } pub fn remove(&mut self, file: impl AsRef) -> anyhow::Result { @@ -177,7 +183,8 @@ impl Filesystem { if let Some(mock) = fs.mock.as_mut() && let Some(result) = mock.remove_directory_async_result { - mock.remove_directory_async_calls += 1; + mock.remove_directory_async_paths + .push(directory.to_string()); return Ok(result); } -- cgit v1.3.1