huskies: merge 982

server/src/pipeline_state/tests.rs

@@ -648,16 +648,20 @@ fn merge_failure_transition_emits_event_with_full_reason() {
     let fired = super::apply::apply_transition(
         story_id,
         PipelineEvent::MergeFailed {
-            reason: reason.to_string(),
+            kind: MergeFailureKind::Other(reason.to_string()),
         },
         None,
     )
     .expect("MergeFailed transition should succeed");
 
-    // The emitted event payload carries the full reason string.
+    // The emitted event payload carries the full reason via display_reason().
     match &fired.event {
-        PipelineEvent::MergeFailed { reason: r } => {
-            assert_eq!(r, reason, "emitted event should carry the full reason");
+        PipelineEvent::MergeFailed { kind } => {
+            assert_eq!(
+                kind.display_reason(),
+                reason,
+                "emitted event should carry the full reason"
+            );
         }
         other => panic!("expected MergeFailed event, got: {other:?}"),
     }
@@ -686,14 +690,14 @@ fn merge_failure_transition_emits_event_with_full_reason() {
 #[test]
 fn merge_failure_plus_merge_failed_is_self_loop() {
     let s = Stage::MergeFailure {
-        reason: "initial failure".into(),
+        kind: MergeFailureKind::Other("initial failure".into()),
         feature_branch: fb("feature/story-1"),
         commits_ahead: nz(1),
     };
     let result = transition(
         s,
         PipelineEvent::MergeFailed {
-            reason: "second failure".into(),
+            kind: MergeFailureKind::Other("second failure".into()),
         },
     );
     assert!(
@@ -722,7 +726,7 @@ fn repeated_merge_failure_apply_transition_no_error_no_duplicate_notification()
     let fired = super::apply::apply_transition(
         story_id,
         PipelineEvent::MergeFailed {
-            reason: "duplicate failure".into(),
+            kind: MergeFailureKind::Other("duplicate failure".into()),
         },
         None,
     )
@@ -766,7 +770,7 @@ fn repeated_merge_failure_apply_transition_no_error_no_duplicate_notification()
 #[test]
 fn merge_failure_unblock_returns_to_merge() {
     let s = Stage::MergeFailure {
-        reason: "conflicts in server/src/main.rs".into(),
+        kind: MergeFailureKind::ConflictDetected(Some("conflicts in server/src/main.rs".into())),
         feature_branch: fb("feature/story-42"),
         commits_ahead: nz(3),
     };
@@ -781,7 +785,7 @@ fn merge_failure_unblock_returns_to_merge() {
 #[test]
 fn merge_failure_demote_returns_to_backlog() {
     let s = Stage::MergeFailure {
-        reason: "conflicts".into(),
+        kind: MergeFailureKind::Other("conflicts".into()),
         feature_branch: fb("feature/story-1"),
         commits_ahead: nz(1),
     };
@@ -799,7 +803,7 @@ fn merge_failure_demote_returns_to_backlog() {
 #[test]
 fn merge_failure_accept_pure_transition() {
     let s = Stage::MergeFailure {
-        reason: "conflicts unresolvable".into(),
+        kind: MergeFailureKind::ConflictDetected(Some("conflicts unresolvable".into())),
         feature_branch: fb("feature/story-1"),
         commits_ahead: nz(1),
     };