Merge pull request #1170 from multiplex55/codex/update-and-add-tests-in-multi_manager-and-settings

test: cover MultiManager reconnect settings compatibility

Author: multiplex55

src/gui/multi_manager_actions.rs

@@ -1093,7 +1093,7 @@ mod tests {
     }
 
     fn clear_toast_log() {
-        let _ = std::fs::remove_file(crate::toast_log::TOAST_LOG_FILE);
+        std::fs::write(crate::toast_log::TOAST_LOG_FILE, "").expect("clear toast log");
     }
 
     fn toast_log_contents() -> String {

src/multi_manager/settings.rs

@@ -56,4 +56,48 @@ mod tests {
         );
         assert_eq!(restored.multi_manager, updated);
     }
+
+    #[test]
+    fn save_multi_manager_settings_omits_obsolete_periodic_reconnect_fields() {
+        let dir = tempfile::tempdir().expect("tempdir");
+        let settings_path = dir.path().join("settings.json");
+        std::fs::write(
+            &settings_path,
+            r#"{
+                "multi_manager": {
+                    "periodic_reconnect_enabled": true,
+                    "reconnect_interval_ms": 1000,
+                    "auto_reconnect_period_ms": 2500
+                }
+            }"#,
+        )
+        .expect("write legacy settings");
+        let settings_path = settings_path.to_string_lossy().to_string();
+
+        let updated = MultiManagerSettings {
+            auto_reconnect_on_load: false,
+            ..Default::default()
+        };
+        save_multi_manager_settings(&settings_path, updated.clone())
+            .expect("save multi manager settings");
+
+        let saved: serde_json::Value =
+            serde_json::from_str(&std::fs::read_to_string(&settings_path).expect("read settings"))
+                .expect("parse saved settings");
+        let multi_manager = saved
+            .get("multi_manager")
+            .and_then(serde_json::Value::as_object)
+            .expect("multi manager object");
+        assert_eq!(
+            multi_manager.get("auto_reconnect_on_load"),
+            Some(&serde_json::Value::Bool(false))
+        );
+        assert!(!multi_manager.contains_key("periodic_reconnect_enabled"));
+        assert!(!multi_manager.contains_key("reconnect_interval_ms"));
+        assert!(!multi_manager.contains_key("auto_reconnect_period_ms"));
+        assert_eq!(
+            Settings::load(&settings_path).unwrap().multi_manager,
+            updated
+        );
+    }
 }

src/settings/model.rs

@@ -1,6 +1,6 @@
 use crate::gui::Panel;
 use crate::hotkey::Key;
-use crate::hotkey::{Hotkey, parse_hotkey};
+use crate::hotkey::{parse_hotkey, Hotkey};
 use crate::settings::defaults::*;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
@@ -781,6 +781,41 @@ mod tests {
         assert_eq!(restored.multi_manager, settings.multi_manager);
     }
 
+    #[test]
+    fn multi_manager_old_json_defaults_auto_reconnect_and_ignores_obsolete_reconnect_fields() {
+        let parsed: Settings = serde_json::from_str(
+            r#"{
+                "multi_manager": {
+                    "enabled": true,
+                    "periodic_reconnect_enabled": true,
+                    "reconnect_interval_ms": 1000,
+                    "auto_reconnect_period_ms": 2500
+                }
+            }"#,
+        )
+        .expect("old settings should deserialize");
+
+        assert!(parsed.multi_manager.auto_reconnect_on_load);
+        assert_eq!(
+            parsed.multi_manager.workspaces_path,
+            MultiManagerSettings::default().workspaces_path
+        );
+    }
+
+    #[test]
+    fn multi_manager_serialization_omits_obsolete_periodic_reconnect_fields() {
+        let json = serde_json::to_value(Settings::default()).expect("serialize settings");
+        let multi_manager = json
+            .get("multi_manager")
+            .and_then(serde_json::Value::as_object)
+            .expect("multi manager object");
+
+        assert!(multi_manager.contains_key("auto_reconnect_on_load"));
+        assert!(!multi_manager.contains_key("periodic_reconnect_enabled"));
+        assert!(!multi_manager.contains_key("reconnect_interval_ms"));
+        assert!(!multi_manager.contains_key("auto_reconnect_period_ms"));
+    }
+
     #[test]
     fn query_results_layout_defaults_are_backward_compatible() {
         let parsed: Settings = serde_json::from_str("{}").expect("settings should deserialize");