huskies: merge 1018

server/src/crdt_state/read.rs

@@ -507,7 +507,7 @@ fn project_stage_for_view(
         }),
         "qa" => Some(Stage::Qa),
         "blocked" => Some(Stage::Blocked {
-            reason: String::new(),
+            reason: resume_to.unwrap_or("").to_string(),
         }),
         "merge" => Some(Stage::Merge {
             feature_branch: BranchName(format!("feature/story-{story_id}")),

server/src/crdt_state/state/tests.rs

@@ -119,8 +119,16 @@ async fn subscribe_receives_stage_transition_events() {
         None,
     );
 
-    let evt: CrdtEvent = rx.try_recv().expect("expected CrdtEvent on insert");
-    assert_eq!(evt.story_id, "906_story_subscribe");
+    // Drain any stale events from concurrent tests until we see ours.
+    // CRDT_EVENT_TX is global; parallel tests emit to the same channel.
+    let evt: CrdtEvent = loop {
+        let e = rx
+            .try_recv()
+            .expect("expected CrdtEvent for 906_story_subscribe");
+        if e.story_id == "906_story_subscribe" {
+            break e;
+        }
+    };
     assert!(evt.from_stage.is_none());
     assert!(matches!(
         evt.to_stage,
@@ -138,8 +146,14 @@ async fn subscribe_receives_stage_transition_events() {
         None,
     );
 
-    let evt: CrdtEvent = rx.try_recv().expect("expected CrdtEvent on stage change");
-    assert_eq!(evt.story_id, "906_story_subscribe");
+    let evt: CrdtEvent = loop {
+        let e = rx
+            .try_recv()
+            .expect("expected CrdtEvent for 906_story_subscribe stage change");
+        if e.story_id == "906_story_subscribe" {
+            break e;
+        }
+    };
     assert!(matches!(
         evt.from_stage,
         Some(crate::pipeline_state::Stage::Backlog)