huskies: merge 866

server/src/pipeline_state/tests.rs

@@ -172,13 +172,7 @@ fn block_from_any_active_stage() {
                 reason: "stuck".into(),
             },
         );
-        assert!(matches!(
-            result,
-            Ok(Stage::Archived {
-                reason: ArchiveReason::Blocked { .. },
-                ..
-            })
-        ));
+        assert!(matches!(result, Ok(Stage::Blocked { .. })));
     }
 
     let m = Stage::Merge {
@@ -191,17 +185,20 @@ fn block_from_any_active_stage() {
             reason: "stuck".into(),
         },
     );
-    assert!(matches!(
-        result,
-        Ok(Stage::Archived {
-            reason: ArchiveReason::Blocked { .. },
-            ..
-        })
-    ));
+    assert!(matches!(result, Ok(Stage::Blocked { .. })));
 }
 
 #[test]
-fn unblock_returns_to_backlog() {
+fn unblock_returns_to_coding() {
+    let s = Stage::Blocked {
+        reason: "test".into(),
+    };
+    let result = transition(s, PipelineEvent::Unblock).unwrap();
+    assert!(matches!(result, Stage::Coding));
+}
+
+#[test]
+fn legacy_unblock_archived_blocked_returns_to_backlog() {
     let s = Stage::Archived {
         archived_at: chrono::Utc::now(),
         reason: ArchiveReason::Blocked {