test: resolve regressions

loichyan · loichyan · commit 0e25e7cd03e0 · 2026-01-29T13:29:24.000+08:00
diff --git a/src/toggle_tests/escape_session_name.stdout b/src/toggle_tests/escape_session_name.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup_before_open}'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=popup_test
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_test
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-L
 		popup_test
diff --git a/src/toggle_tests/open_nested_popup.stdout b/src/toggle_tests/open_nested_popup.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup_before_open}'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=popup_test
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_test
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-L
 		popup_test
diff --git a/src/toggle_tests/open_nested_with_id.stdout b/src/toggle_tests/open_nested_with_id.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup_before_open}'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=popup_test
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_test
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-L
 		popup_test
diff --git a/src/toggle_tests/open_nested_with_toggle_key.stdout b/src/toggle_tests/open_nested_with_toggle_key.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup_before_open}'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=popup_test
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_test
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-L
 		popup_test
diff --git a/src/toggle_tests/open_popup.stdout b/src/toggle_tests/open_popup.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup_before_open}'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=popup_test
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_test
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-L
 		popup_test
diff --git a/src/toggle_tests/open_with_environment.stdout b/src/toggle_tests/open_with_environment.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup_before_open}'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=popup_test
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_test
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-L
 		popup_test
diff --git a/src/toggle_tests/open_with_id.stdout b/src/toggle_tests/open_with_id.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup_before_open}'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=popup_test
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_test
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-L
 		popup_test
diff --git a/src/toggle_tests/open_with_overrides.stdout b/src/toggle_tests/open_with_overrides.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup-focus} --enter'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=popup_server
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_server
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-S
 		/local/socket_path/popup_server
diff --git a/src/toggle_tests/open_with_socket_path.stdout b/src/toggle_tests/open_with_socket_path.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup_before_open}'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=socket_path_server
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=socket_path_server
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-S
 		/path/to/socket_path_server
diff --git a/src/toggle_tests/open_with_style.stdout b/src/toggle_tests/open_with_style.stdout
@@ -16,10 +16,12 @@ TMUX:BEGIN[1] {
 	50%
 	-h
 	70%
+	-e
+	TMUX_POPUP_SERVER=popup_test
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_test
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-L
 		popup_test
diff --git a/src/toggle_tests/open_with_toggle_key.stdout b/src/toggle_tests/open_with_toggle_key.stdout
@@ -8,10 +8,12 @@ TMUX:BEGIN[1] {
 	run '#{@popup_before_open}'
 	;
 	display-popup
+	-e
+	TMUX_POPUP_SERVER=popup_test
 	TMUX:BEGIN[2] {
 		TMUX=tmux-test
-		TMUX_POPUP_SERVER=popup_test
-		SHELL=/default/shell
+		TMUX_POPUP_SERVER=
+		SHELL=/system/shell
 	}
 		-L
 		popup_test
diff --git a/src/toggle_tests/tmux b/src/toggle_tests/tmux
@@ -24,7 +24,6 @@ return_batch_options() {
 		t_toggle_mode="switch" \
 		t_socket_name="popup_test" \
 		t_socket_path="" \
-		t_default_shell="/default/shell" \
 		t_current_pane_id="%current_pane_id"
 	cat "$f_args"
 	exit
