huskies: merge 1009

server/src/crdt_state/state/tests.rs

@@ -117,8 +117,6 @@ async fn subscribe_receives_stage_transition_events() {
         None,
         None,
         None,
-        None,
-        None,
     );
 
     let evt: CrdtEvent = rx.try_recv().expect("expected CrdtEvent on insert");
@@ -138,8 +136,6 @@ async fn subscribe_receives_stage_transition_events() {
         None,
         None,
         None,
-        None,
-        None,
     );
 
     let evt: CrdtEvent = rx.try_recv().expect("expected CrdtEvent on stage change");
@@ -148,7 +144,10 @@ async fn subscribe_receives_stage_transition_events() {
         evt.from_stage,
         Some(crate::pipeline_state::Stage::Backlog)
     ));
-    assert!(matches!(evt.to_stage, crate::pipeline_state::Stage::Coding));
+    assert!(matches!(
+        evt.to_stage,
+        crate::pipeline_state::Stage::Coding { .. }
+    ));
 }
 
 #[tokio::test]