From 9a2cee2532e5d28d5cea5726f35ab3c7046e7c0d Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 19 Jul 2026 19:41:15 +0900 Subject: fix(root-package-loader): un-ignore 4 tests by fixing stability-flag isset() port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit extract_stability_flags ported PHP's `isset($stabilityFlags[$name]) && $stabilityFlags[$name] > $stability` as `unwrap_or(i64::MAX) > stability`, so the check always short-circuited to "already more unstable" and no flag (e.g. from an explicit `*@dev` requirement) was ever recorded. Fixed using Option::is_some_and, a direct translation of PHP's isset() && ... check. Also fixes tests/common/test_case.rs's shared installation_manager() helper, which built a real InstallationManager::new instead of the __new_mock constructor (mirroring PHP's FactoryMock::createInstallationManager()), so it always had zero installers registered and wrote install-path: null into fixture installed.json files. Un-ignores test_reinstall_command, test_locally_modified_packages_from_source/ _from_dist, and test_package_still_present_error_when_no_install_flag_used — the first three were already passing (their #[ignore] reasons were stale), the last is fixed by the test_case.rs change above. Updates the #[ignore] reasons on installer_test.rs's three fixture-driven integration tests to reflect their current state: the install pipeline now runs end-to-end, but the ~189-fixture installer/ set still hits several independent, unrelated bugs/gaps that need case-by-case triage rather than a single fix. Co-Authored-By: Claude Sonnet 5 --- crates/shirabe/src/package/loader/root_package_loader.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/shirabe/src/package') diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index b3ed8c41..95cd1225 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -337,7 +337,7 @@ impl RootPackageLoader { let normalized_m1 = VersionParser::normalize_stability(&m1).unwrap_or_default(); let stability = stabilities[normalized_m1.as_str()]; - if stability_flags.get(&name).copied().unwrap_or(i64::MAX) > stability { + if stability_flags.get(&name).is_some_and(|&f| f > stability) { continue; } stability_flags.insert(name, stability); @@ -357,7 +357,7 @@ impl RootPackageLoader { if stability_name != "stable" { let name = strtolower(req_name); let stability = stabilities[stability_name.as_str()]; - if stability_flags.get(&name).copied().unwrap_or(i64::MAX) > stability + if stability_flags.get(&name).is_some_and(|&f| f > stability) || minimum_stability_val > stability { continue; -- cgit v1.3.1