diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml index 1a772710c98f8437932d6e8918df65d003d7962e..35cef84f0366b16d9e31b2416e7a6a10173ff5ef 100644 --- a/crates/auto_update/Cargo.toml +++ b/crates/auto_update/Cargo.toml @@ -32,3 +32,6 @@ workspace-hack.workspace = true [target.'cfg(not(target_os = "windows"))'.dependencies] which.workspace = true + +[dev-dependencies] +gpui = { workspace = true, "features" = ["test-support"] } diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs index c1e318ee84f5228156826c340c3463fde2ef1bb8..ac5b03d40d615ea2887d8726ba248304b34c9874 100644 --- a/crates/auto_update/src/auto_update.rs +++ b/crates/auto_update/src/auto_update.rs @@ -992,8 +992,27 @@ pub fn finalize_auto_update_on_quit() { #[cfg(test)] mod tests { + use gpui::TestAppContext; + use settings::default_settings; + use super::*; + #[gpui::test] + fn test_auto_update_defaults_to_true(cx: &mut TestAppContext) { + cx.update(|cx| { + let mut store = SettingsStore::new(cx); + store + .set_default_settings(&default_settings(), cx) + .expect("Unable to set default settings"); + store + .set_user_settings("{}", cx) + .expect("Unable to set user settings"); + cx.set_global(store); + AutoUpdateSetting::register(cx); + assert!(AutoUpdateSetting::get_global(cx).0); + }); + } + #[test] fn test_stable_does_not_update_when_fetched_version_is_not_higher() { let release_channel = ReleaseChannel::Stable; diff --git a/crates/project/src/direnv.rs b/crates/project/src/direnv.rs index 9ba0ad10e3173a1930186db28f7efb5d9a8267f7..32f4963fd19805e369c696cfd30c8ef599bd06f3 100644 --- a/crates/project/src/direnv.rs +++ b/crates/project/src/direnv.rs @@ -65,7 +65,7 @@ pub async fn load_direnv_environment( let output = String::from_utf8_lossy(&direnv_output.stdout); if output.is_empty() { // direnv outputs nothing when it has no changes to apply to environment variables - return Ok(HashMap::new()); + return Ok(HashMap::default()); } match serde_json::from_str(&output) {