diff --git a/src/common/input/config.rs b/src/common/input/config.rs index 81c041207..3263b5710 100644 --- a/src/common/input/config.rs +++ b/src/common/input/config.rs @@ -199,12 +199,10 @@ mod config_test { assert_eq!(result.unwrap(), Config::default()); } - // This test needs a split somewhere between test and normal runs, - // since otherwise it would look in a local configuration and fail. - //#[test] - //fn try_from_cli_args_default() { - //let opts = CliArgs::default(); - //let result = Config::try_from(&opts); - //assert_eq!(result.unwrap(), Config::default()); - //} + #[test] + fn try_from_cli_args_default() { + let opts = CliArgs::default(); + let result = Config::try_from(&opts); + assert_eq!(result.unwrap(), Config::default()); + } } diff --git a/src/common/setup.rs b/src/common/setup.rs index 9d1e7d19f..70e0ded47 100644 --- a/src/common/setup.rs +++ b/src/common/setup.rs @@ -48,6 +48,7 @@ pub mod install { } } +#[cfg(not(test))] pub fn find_default_config_dir() -> Option { vec![ Some(xdg_config_dir()), @@ -60,6 +61,11 @@ pub fn find_default_config_dir() -> Option { .flatten() } +#[cfg(test)] +pub fn find_default_config_dir() -> Option { + None +} + pub fn xdg_config_dir() -> PathBuf { let project_dirs = ProjectDirs::from("org", "Zellij Contributors", "Zellij").unwrap(); project_dirs.config_dir().to_owned()