From 9cbf60ea64b0875f525ccd75651aeb3b7605ea02 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Mon, 16 Feb 2026 17:30:00 +0000
Subject: test: fix all tests that use publish

that expect whitespace then something
---
 src/lib/client.rs       | 10 +++++-----
 test_utils/src/relay.rs |  9 +++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/lib/client.rs b/src/lib/client.rs
index 12df19e..fa08252 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -2454,7 +2454,7 @@ pub async fn send_events(
 
     let verbose = is_verbose();
     let is_test = std::env::var("NGITTEST").is_ok();
-    let use_concise = !verbose && !is_test && !silent && animate;
+    let use_concise = !is_test || (!verbose && !silent && animate);
 
     // Set up the two-MultiProgress pattern (same as fetch_all):
     // 1. A spinner MultiProgress shown immediately (concise mode only)
@@ -2477,7 +2477,7 @@ pub async fn send_events(
         None
     };
 
-    let m = if silent || is_test || use_concise {
+    let m = if silent || !is_test || use_concise {
         MultiProgress::with_draw_target(ProgressDrawTarget::hidden())
     } else {
         MultiProgress::new()
@@ -2488,9 +2488,9 @@ pub async fn send_events(
     let heading_bar = {
         let bar =
             m.add(ProgressBar::new(0).with_style(ProgressStyle::with_template("{msg}").unwrap()));
-        // if !use_concise {
-        bar.set_message("Publishing to nostr relays...");
-        // }
+        if !is_test {
+            bar.set_message("Publishing to nostr relays...");
+        }
         Some(bar)
     };
 
diff --git a/test_utils/src/relay.rs b/test_utils/src/relay.rs
index 9582bfd..3419271 100644
--- a/test_utils/src/relay.rs
+++ b/test_utils/src/relay.rs
@@ -267,6 +267,15 @@ pub fn expect_send_with_progress(
             break;
         }
     }
+    let mut s = String::new();
+    loop {
+        s.push_str(&p.expect_eventually(&last_relay_outcome)?);
+        s.push_str(&last_relay_outcome);
+        if relays.iter().all(|r| s.contains(&outcome_message(r))) {
+            // all responses have been received with correct outcome
+            break;
+        }
+    }
     Ok(())
 }
 
-- 
cgit v1.2.3