v0.8.19

src/engine/tests.rs

@@ -233,6 +233,7 @@ mod tests {
             paused_at: None,
             deferred_mode: None,
             deferred_preset: None,
+            deferred_setpoint: None,
             safety_expires_at: None,
         }
     }
@@ -309,6 +310,20 @@ mod tests {
         assert_eq!(zone.manual_setpoint, Some(22.0));
     }
 
+    #[test]
+    fn deferred_non_custom_preset_wins_over_stale_custom_setpoint() {
+        let now = Utc::now();
+        let mut zone = test_zone("device");
+        let mut session = temporary_session(now);
+        session.deferred_preset = Some("comfort".into());
+        session.deferred_setpoint = Some(27.0);
+        zone.temporary_quick_thermostat = Some(session);
+
+        assert!(finish_temporary_quick_thermostat(&mut zone, &[], "cool"));
+        assert_eq!(zone.manual_preset.as_deref(), Some("comfort"));
+        assert!(zone.manual_setpoint.is_none());
+    }
+
     #[test]
     fn temporary_session_without_activation_marker_is_never_active() {
         let now = Utc::now();