huskies: merge 988

server/src/pipeline_state/tests.rs

@@ -562,7 +562,7 @@ fn freeze_transitions_to_frozen_variant_with_resume_to() {
 
     let item = read_typed(story_id).unwrap().unwrap();
     assert!(matches!(item.stage, Stage::Coding));
-    assert!(!item.is_frozen());
+    assert!(!matches!(item.stage, Stage::Frozen { .. }));
 
     super::apply::transition_to_frozen(story_id).expect("freeze should succeed");
 
@@ -574,7 +574,10 @@ fn freeze_transitions_to_frozen_variant_with_resume_to() {
         ),
         other => panic!("stage should be Stage::Frozen after freeze; got {other:?}"),
     }
-    assert!(item.is_frozen(), "is_frozen() should be true after freeze");
+    assert!(
+        matches!(item.stage, Stage::Frozen { .. }),
+        "is_frozen() should be true after freeze"
+    );
 
     super::apply::transition_to_unfrozen(story_id).expect("unfreeze should succeed");
 
@@ -585,7 +588,7 @@ fn freeze_transitions_to_frozen_variant_with_resume_to() {
         item.stage
     );
     assert!(
-        !item.is_frozen(),
+        !matches!(item.stage, Stage::Frozen { .. }),
         "is_frozen() should be false after unfreeze"
     );
 }