diff --git a/crates/vite_install/src/commands/add.rs b/crates/vite_install/src/commands/add.rs index 1eda551ed5..32b3a68aac 100644 --- a/crates/vite_install/src/commands/add.rs +++ b/crates/vite_install/src/commands/add.rs @@ -250,32 +250,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from("1.0.0"), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager; #[test] fn test_pnpm_basic_add() { diff --git a/crates/vite_install/src/commands/approve_builds.rs b/crates/vite_install/src/commands/approve_builds.rs index 50ddc90b8e..b09d9a8860 100644 --- a/crates/vite_install/src/commands/approve_builds.rs +++ b/crates/vite_install/src/commands/approve_builds.rs @@ -281,32 +281,9 @@ fn warn_dropped_pass_through(extras: Option<&[String]>) { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn pnpm_no_args_interactive() { diff --git a/crates/vite_install/src/commands/audit.rs b/crates/vite_install/src/commands/audit.rs index 89790ffd8d..b4b2bc4722 100644 --- a/crates/vite_install/src/commands/audit.rs +++ b/crates/vite_install/src/commands/audit.rs @@ -176,32 +176,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let _temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(_temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_npm_audit() { diff --git a/crates/vite_install/src/commands/cache.rs b/crates/vite_install/src/commands/cache.rs index a8011e7d86..8535901b3d 100644 --- a/crates/vite_install/src/commands/cache.rs +++ b/crates/vite_install/src/commands/cache.rs @@ -152,32 +152,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_cache_dir() { diff --git a/crates/vite_install/src/commands/config.rs b/crates/vite_install/src/commands/config.rs index 59322bc71b..267d4f6770 100644 --- a/crates/vite_install/src/commands/config.rs +++ b/crates/vite_install/src/commands/config.rs @@ -166,32 +166,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_config_set() { diff --git a/crates/vite_install/src/commands/dedupe.rs b/crates/vite_install/src/commands/dedupe.rs index 33b704cff3..ca25a1b431 100644 --- a/crates/vite_install/src/commands/dedupe.rs +++ b/crates/vite_install/src/commands/dedupe.rs @@ -89,32 +89,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_dedupe_basic() { diff --git a/crates/vite_install/src/commands/deprecate.rs b/crates/vite_install/src/commands/deprecate.rs index 4aa7ae00aa..3eb1ac60c7 100644 --- a/crates/vite_install/src/commands/deprecate.rs +++ b/crates/vite_install/src/commands/deprecate.rs @@ -75,33 +75,11 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - use crate::package_manager::PackageManagerType; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::{ + PackageManagerType, create_mock_package_manager_with_version as create_mock_package_manager, + }; #[test] fn test_deprecate_basic() { diff --git a/crates/vite_install/src/commands/dist_tag.rs b/crates/vite_install/src/commands/dist_tag.rs index 6f0c2616ae..12868c8c7a 100644 --- a/crates/vite_install/src/commands/dist_tag.rs +++ b/crates/vite_install/src/commands/dist_tag.rs @@ -102,32 +102,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let _temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(_temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_npm_dist_tag_list() { diff --git a/crates/vite_install/src/commands/dlx.rs b/crates/vite_install/src/commands/dlx.rs index bd75cfe7c0..1b3dd4d487 100644 --- a/crates/vite_install/src/commands/dlx.rs +++ b/crates/vite_install/src/commands/dlx.rs @@ -297,32 +297,9 @@ fn extract_command_from_spec(spec: &str) -> String { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_extract_command_from_spec() { diff --git a/crates/vite_install/src/commands/fund.rs b/crates/vite_install/src/commands/fund.rs index c49777d416..edf376d6d8 100644 --- a/crates/vite_install/src/commands/fund.rs +++ b/crates/vite_install/src/commands/fund.rs @@ -59,33 +59,11 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - use crate::package_manager::PackageManagerType; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::{ + PackageManagerType, create_mock_package_manager_with_version as create_mock_package_manager, + }; #[test] fn test_fund_basic() { diff --git a/crates/vite_install/src/commands/install.rs b/crates/vite_install/src/commands/install.rs index de591a3682..47e85c61cc 100644 --- a/crates/vite_install/src/commands/install.rs +++ b/crates/vite_install/src/commands/install.rs @@ -373,32 +373,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_basic_install() { diff --git a/crates/vite_install/src/commands/link.rs b/crates/vite_install/src/commands/link.rs index ec68367c7f..aeb0708291 100644 --- a/crates/vite_install/src/commands/link.rs +++ b/crates/vite_install/src/commands/link.rs @@ -71,32 +71,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_link_no_package() { diff --git a/crates/vite_install/src/commands/list.rs b/crates/vite_install/src/commands/list.rs index 67099e0df9..ce01aed9bb 100644 --- a/crates/vite_install/src/commands/list.rs +++ b/crates/vite_install/src/commands/list.rs @@ -336,32 +336,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_list_basic() { diff --git a/crates/vite_install/src/commands/login.rs b/crates/vite_install/src/commands/login.rs index e09b869e38..7c0834d68a 100644 --- a/crates/vite_install/src/commands/login.rs +++ b/crates/vite_install/src/commands/login.rs @@ -82,32 +82,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let _temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(_temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_npm_login() { diff --git a/crates/vite_install/src/commands/logout.rs b/crates/vite_install/src/commands/logout.rs index 36d62cf4f8..524bd61baf 100644 --- a/crates/vite_install/src/commands/logout.rs +++ b/crates/vite_install/src/commands/logout.rs @@ -82,32 +82,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let _temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(_temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_npm_logout() { diff --git a/crates/vite_install/src/commands/outdated.rs b/crates/vite_install/src/commands/outdated.rs index 7f06d6c7fb..676fb14ef1 100644 --- a/crates/vite_install/src/commands/outdated.rs +++ b/crates/vite_install/src/commands/outdated.rs @@ -334,32 +334,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_outdated_basic() { diff --git a/crates/vite_install/src/commands/owner.rs b/crates/vite_install/src/commands/owner.rs index ca474f7924..baa898438a 100644 --- a/crates/vite_install/src/commands/owner.rs +++ b/crates/vite_install/src/commands/owner.rs @@ -76,33 +76,11 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - use crate::package_manager::PackageManagerType; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::{ + PackageManagerType, create_mock_package_manager_with_version as create_mock_package_manager, + }; #[test] fn test_pnpm_owner_list_uses_npm() { diff --git a/crates/vite_install/src/commands/pack.rs b/crates/vite_install/src/commands/pack.rs index 82eaf6e4e8..5a5ab8683f 100644 --- a/crates/vite_install/src/commands/pack.rs +++ b/crates/vite_install/src/commands/pack.rs @@ -224,28 +224,12 @@ mod tests { use vite_str::Str; use super::*; + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; fn create_temp_dir() -> TempDir { tempdir().expect("Failed to create temp directory") } - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } - #[test] fn test_pnpm_pack_basic() { let pm = create_mock_package_manager(PackageManagerType::Pnpm, "10.0.0"); diff --git a/crates/vite_install/src/commands/ping.rs b/crates/vite_install/src/commands/ping.rs index 9fe7156654..19b1bc1049 100644 --- a/crates/vite_install/src/commands/ping.rs +++ b/crates/vite_install/src/commands/ping.rs @@ -53,33 +53,11 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - use crate::package_manager::PackageManagerType; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::{ + PackageManagerType, create_mock_package_manager_with_version as create_mock_package_manager, + }; #[test] fn test_ping_basic() { diff --git a/crates/vite_install/src/commands/prune.rs b/crates/vite_install/src/commands/prune.rs index 879f268036..71b9a7804d 100644 --- a/crates/vite_install/src/commands/prune.rs +++ b/crates/vite_install/src/commands/prune.rs @@ -94,32 +94,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_prune() { diff --git a/crates/vite_install/src/commands/publish.rs b/crates/vite_install/src/commands/publish.rs index 908f9dc20b..8a007d3a12 100644 --- a/crates/vite_install/src/commands/publish.rs +++ b/crates/vite_install/src/commands/publish.rs @@ -252,32 +252,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_publish() { diff --git a/crates/vite_install/src/commands/rebuild.rs b/crates/vite_install/src/commands/rebuild.rs index 37d796ab0e..0e51efab98 100644 --- a/crates/vite_install/src/commands/rebuild.rs +++ b/crates/vite_install/src/commands/rebuild.rs @@ -81,32 +81,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let _temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(_temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_npm_rebuild() { diff --git a/crates/vite_install/src/commands/remove.rs b/crates/vite_install/src/commands/remove.rs index 05256acd92..218c2a1853 100644 --- a/crates/vite_install/src/commands/remove.rs +++ b/crates/vite_install/src/commands/remove.rs @@ -155,32 +155,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from("1.0.0"), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager; #[test] fn test_pnpm_basic_remove() { diff --git a/crates/vite_install/src/commands/search.rs b/crates/vite_install/src/commands/search.rs index 5e4f851eb7..d505155c94 100644 --- a/crates/vite_install/src/commands/search.rs +++ b/crates/vite_install/src/commands/search.rs @@ -68,33 +68,11 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - use crate::package_manager::PackageManagerType; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::{ + PackageManagerType, create_mock_package_manager_with_version as create_mock_package_manager, + }; #[test] fn test_search_basic() { diff --git a/crates/vite_install/src/commands/stage.rs b/crates/vite_install/src/commands/stage.rs index cbd88079cf..036afa3576 100644 --- a/crates/vite_install/src/commands/stage.rs +++ b/crates/vite_install/src/commands/stage.rs @@ -331,32 +331,9 @@ fn warn_npm_workspace_unsupported(subcommand: &StageSubcommand) { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; fn publish_sub_full( tag: Option<&str>, diff --git a/crates/vite_install/src/commands/token.rs b/crates/vite_install/src/commands/token.rs index f409a565d8..3c40850746 100644 --- a/crates/vite_install/src/commands/token.rs +++ b/crates/vite_install/src/commands/token.rs @@ -117,33 +117,11 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - use crate::package_manager::PackageManagerType; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::{ + PackageManagerType, create_mock_package_manager_with_version as create_mock_package_manager, + }; #[test] fn test_token_list() { diff --git a/crates/vite_install/src/commands/unlink.rs b/crates/vite_install/src/commands/unlink.rs index e69b56a49d..039349415b 100644 --- a/crates/vite_install/src/commands/unlink.rs +++ b/crates/vite_install/src/commands/unlink.rs @@ -89,32 +89,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_unlink_no_package() { diff --git a/crates/vite_install/src/commands/update.rs b/crates/vite_install/src/commands/update.rs index 9c9c1ee31f..5bf475f313 100644 --- a/crates/vite_install/src/commands/update.rs +++ b/crates/vite_install/src/commands/update.rs @@ -202,32 +202,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_basic_update() { diff --git a/crates/vite_install/src/commands/version.rs b/crates/vite_install/src/commands/version.rs index 88ccf3f82b..63dda81f47 100644 --- a/crates/vite_install/src/commands/version.rs +++ b/crates/vite_install/src/commands/version.rs @@ -93,27 +93,9 @@ fn bun_supports_version_command(version: &str) -> bool { #[cfg(test)] mod tests { - use tempfile::tempdir; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_mock_package_manager(pm_type: PackageManagerType) -> PackageManager { - let temp_dir = tempdir().expect("Failed to create temp directory"); - let root = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = root.join("install"); - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from("1.0.0"), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: root, - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager; fn resolve( package_manager: &PackageManager, diff --git a/crates/vite_install/src/commands/view.rs b/crates/vite_install/src/commands/view.rs index 73c2f6bbe5..7c0b209780 100644 --- a/crates/vite_install/src/commands/view.rs +++ b/crates/vite_install/src/commands/view.rs @@ -119,33 +119,11 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - use crate::package_manager::PackageManagerType; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::{ + PackageManagerType, create_mock_package_manager_with_version as create_mock_package_manager, + }; #[test] fn test_pnpm_view_uses_pnpm() { diff --git a/crates/vite_install/src/commands/whoami.rs b/crates/vite_install/src/commands/whoami.rs index 385f12aea7..5b1963d662 100644 --- a/crates/vite_install/src/commands/whoami.rs +++ b/crates/vite_install/src/commands/whoami.rs @@ -85,32 +85,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let _temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(_temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_npm_whoami() { diff --git a/crates/vite_install/src/commands/why.rs b/crates/vite_install/src/commands/why.rs index 88a5e8d18f..8409dbb97f 100644 --- a/crates/vite_install/src/commands/why.rs +++ b/crates/vite_install/src/commands/why.rs @@ -256,32 +256,9 @@ impl PackageManager { #[cfg(test)] mod tests { - use tempfile::{TempDir, tempdir}; - use vite_path::AbsolutePathBuf; - use vite_str::Str; use super::*; - - fn create_temp_dir() -> TempDir { - tempdir().expect("Failed to create temp directory") - } - - fn create_mock_package_manager(pm_type: PackageManagerType, version: &str) -> PackageManager { - let temp_dir = create_temp_dir(); - let temp_dir_path = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); - let install_dir = temp_dir_path.join("install"); - - PackageManager { - client: pm_type, - package_name: pm_type.to_string().into(), - version: Str::from(version), - hash: None, - bin_name: pm_type.to_string().into(), - workspace_root: temp_dir_path.clone(), - is_monorepo: false, - install_dir, - } - } + use crate::package_manager::create_mock_package_manager_with_version as create_mock_package_manager; #[test] fn test_pnpm_why_basic() { diff --git a/crates/vite_install/src/package_manager.rs b/crates/vite_install/src/package_manager.rs index e7fcb975f1..72ec48d8a2 100644 --- a/crates/vite_install/src/package_manager.rs +++ b/crates/vite_install/src/package_manager.rs @@ -153,6 +153,31 @@ pub struct PackageManager { pub install_dir: AbsolutePathBuf, } +#[cfg(test)] +pub(crate) fn create_mock_package_manager(client: PackageManagerType) -> PackageManager { + create_mock_package_manager_with_version(client, "1.0.0") +} + +#[cfg(test)] +pub(crate) fn create_mock_package_manager_with_version( + client: PackageManagerType, + version: &str, +) -> PackageManager { + let temp_dir = tempfile::tempdir().expect("Failed to create temp directory"); + let root = AbsolutePathBuf::new(temp_dir.path().to_path_buf()).unwrap(); + + PackageManager { + client, + package_name: client.to_string().into(), + version: version.into(), + hash: None, + bin_name: client.to_string().into(), + workspace_root: root.clone(), + is_monorepo: false, + install_dir: root.join("install"), + } +} + #[derive(Debug)] pub struct PackageManagerBuilder { client_override: Option,