From 22b944ef4b1ba90ce68816c6fe9cb8c7d1cc7ea2 Mon Sep 17 00:00:00 2001
From: Peter Ammon <rf@fishshell.com>
Date: Sun, 16 Feb 2025 11:26:24 -0800
Subject: [PATCH] Get tmux-complete2.fish passing on macOS

---
 tests/checks/tmux-complete2.fish | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tests/checks/tmux-complete2.fish b/tests/checks/tmux-complete2.fish
index d7ecd0f17..b24ab8b05 100644
--- a/tests/checks/tmux-complete2.fish
+++ b/tests/checks/tmux-complete2.fish
@@ -6,19 +6,33 @@
 
 isolated-tmux-start
 
-isolated-tmux send-keys 'touch ~/"path with spaces"' Enter C-l \
-    'cat ~/space' Tab
+isolated-tmux send-keys 'touch ~/"path with spaces"' Enter
+tmux-sleep
+isolated-tmux capture-pane -p
+# CHECK: prompt 0> touch {{.*}}
+# CHECK: prompt 1>
+
+isolated-tmux send-keys C-l 'cat ~/space' Tab
 tmux-sleep
 isolated-tmux capture-pane -p
 # CHECK: prompt 1> cat ~/path\ with\ spaces
 
-isolated-tmux send-keys C-c '
+# Clear screen.
+isolated-tmux send-keys C-c
+tmux-sleep
+
+isolated-tmux send-keys '
     set -g fish_autosuggestion_enabled 0
     set -l FISH_TEST_VAR_1 /
     set -l FISH_TEST_VAR_2 /
-' Enter C-l 'echo $FISH_TEST_v' Tab
+' Enter C-l
 tmux-sleep
 isolated-tmux capture-pane -p
-# CHECK: prompt 2> echo $FISH_TEST_VAR_
-# CHECK: $FISH_TEST_VAR_1  (Variable: /)  $FISH_TEST_VAR_2  (Variable: /)
+# Note we keep prompt 1 because the above "set" commands don't bump $status_generation.
+# CHECK: prompt 1>
 
+isolated-tmux send-keys 'echo $FISH_TEST_v' Tab
+tmux-sleep
+isolated-tmux capture-pane -p
+# CHECK: prompt 1> echo $FISH_TEST_VAR_
+# CHECK: $FISH_TEST_VAR_1  (Variable: /)  $FISH_TEST_VAR_2  (Variable: /)