chore: tidy up functions for testing

Author: ynqa

zsh-render-parity/tests/middle_insert_wrap.rs

@@ -6,7 +6,7 @@ use portable_pty::CommandBuilder;
 use zsherio::{
     opts::clear_screen_and_move_cursor_to,
     scenarios::middle_insert_wrap::{scenario, TERMINAL_COLS, TERMINAL_ROWS},
-    session::{spawn_session_with_cursor, spawn_zsh_session},
+    session::{spawn_session, spawn_zsh_session},
     ScenarioRun,
 };
 
@@ -28,7 +28,7 @@ fn zsh_pretend_matches_zsh_for_middle_insert_wrap() -> anyhow::Result<()> {
 }
 
 fn run_zsh() -> anyhow::Result<ScenarioRun> {
-    let mut session = spawn_zsh_session(TERMINAL_ROWS, TERMINAL_COLS)?;
+    let mut session = spawn_zsh_session((TERMINAL_ROWS, TERMINAL_COLS), None)?;
 
     clear_screen_and_move_cursor_to(&mut session, TERMINAL_ROWS, 1)?;
     thread::sleep(Duration::from_millis(300));
@@ -37,12 +37,10 @@ fn run_zsh() -> anyhow::Result<ScenarioRun> {
 }
 
 fn run_zsh_pretend() -> anyhow::Result<ScenarioRun> {
-    let mut session = spawn_session_with_cursor(
+    let mut session = spawn_session(
         CommandBuilder::new(ZSH_PRETEND_BIN),
-        TERMINAL_ROWS,
-        TERMINAL_COLS,
-        TERMINAL_ROWS,
-        1,
+        (TERMINAL_ROWS, TERMINAL_COLS),
+        Some((TERMINAL_ROWS, 1)),
     )?;
 
     wait_for_prompt(&session, |line| line.starts_with("❯❯ "))?;

zsh-render-parity/tests/middle_prompt_start.rs

@@ -5,7 +5,7 @@ use zsherio::{
     scenarios::middle_prompt_start::{
         scenario, START_CURSOR_COL, START_CURSOR_ROW, TERMINAL_COLS, TERMINAL_ROWS,
     },
-    session::spawn_session_with_cursor,
+    session::{spawn_session, spawn_zsh_session},
     ScenarioRun,
 };
 
@@ -27,31 +27,20 @@ fn zsh_pretend_matches_zsh_for_middle_prompt_start() -> anyhow::Result<()> {
 }
 
 fn run_zsh() -> anyhow::Result<ScenarioRun> {
-    let mut cmd = CommandBuilder::new("/bin/zsh");
-    cmd.arg("-fi");
-    cmd.env("PS1", "❯❯ ");
-    cmd.env("RPS1", "");
-    cmd.env("RPROMPT", "");
-    cmd.env("PROMPT_EOL_MARK", "");
-    let mut session = spawn_session_with_cursor(
-        cmd,
-        TERMINAL_ROWS,
-        TERMINAL_COLS,
-        START_CURSOR_ROW,
-        START_CURSOR_COL,
+    let mut session = spawn_zsh_session(
+        (TERMINAL_ROWS, TERMINAL_COLS),
+        Some((START_CURSOR_ROW, START_CURSOR_COL)),
     )?;
     wait_for_prompt(&session, |line| line.contains("❯❯ "))?;
 
     scenario().run("zsh", &mut session)
 }
 
 fn run_zsh_pretend() -> anyhow::Result<ScenarioRun> {
-    let mut session = spawn_session_with_cursor(
+    let mut session = spawn_session(
         CommandBuilder::new(ZSH_PRETEND_BIN),
-        TERMINAL_ROWS,
-        TERMINAL_COLS,
-        START_CURSOR_ROW,
-        START_CURSOR_COL,
+        (TERMINAL_ROWS, TERMINAL_COLS),
+        Some((START_CURSOR_ROW, START_CURSOR_COL)),
     )?;
 
     wait_for_prompt(&session, |line| line.contains("❯❯ "))?;

zsh-render-parity/tests/resize_wrap.rs

@@ -6,7 +6,7 @@ use portable_pty::CommandBuilder;
 use zsherio::{
     opts::clear_screen_and_move_cursor_to,
     scenarios::resize_wrap::{scenario, TERMINAL_COLS, TERMINAL_ROWS},
-    session::{spawn_session_with_cursor, spawn_zsh_session},
+    session::{spawn_session, spawn_zsh_session},
     ScenarioRun,
 };
 
@@ -31,7 +31,7 @@ fn zsh_pretend_matches_zsh_for_resize_wrap() -> anyhow::Result<()> {
 }
 
 fn run_zsh() -> anyhow::Result<ScenarioRun> {
-    let mut session = spawn_zsh_session(TERMINAL_ROWS, TERMINAL_COLS)?;
+    let mut session = spawn_zsh_session((TERMINAL_ROWS, TERMINAL_COLS), None)?;
 
     clear_screen_and_move_cursor_to(&mut session, TERMINAL_ROWS, 1)?;
     thread::sleep(Duration::from_millis(300));
@@ -40,12 +40,10 @@ fn run_zsh() -> anyhow::Result<ScenarioRun> {
 }
 
 fn run_zsh_pretend() -> anyhow::Result<ScenarioRun> {
-    let mut session = spawn_session_with_cursor(
+    let mut session = spawn_session(
         CommandBuilder::new(ZSH_PRETEND_BIN),
-        TERMINAL_ROWS,
-        TERMINAL_COLS,
-        TERMINAL_ROWS,
-        1,
+        (TERMINAL_ROWS, TERMINAL_COLS),
+        Some((TERMINAL_ROWS, 1)),
     )?;
 
     wait_for_prompt(&session, |line| line.starts_with("❯❯ "))?;

zsh-render-parity/tests/small_terminal_overflow.rs

@@ -6,7 +6,7 @@ use portable_pty::CommandBuilder;
 use zsherio::{
     opts::clear_screen_and_move_cursor_to,
     scenarios::small_terminal_overflow::{scenario, TERMINAL_COLS, TERMINAL_ROWS},
-    session::{spawn_session_with_cursor, spawn_zsh_session},
+    session::{spawn_session, spawn_zsh_session},
     ScenarioRun,
 };
 
@@ -28,7 +28,7 @@ fn zsh_pretend_matches_zsh_for_small_terminal_overflow() -> anyhow::Result<()> {
 }
 
 fn run_zsh() -> anyhow::Result<ScenarioRun> {
-    let mut session = spawn_zsh_session(TERMINAL_ROWS, TERMINAL_COLS)?;
+    let mut session = spawn_zsh_session((TERMINAL_ROWS, TERMINAL_COLS), None)?;
 
     clear_screen_and_move_cursor_to(&mut session, TERMINAL_ROWS, 1)?;
     thread::sleep(Duration::from_millis(300));
@@ -37,12 +37,10 @@ fn run_zsh() -> anyhow::Result<ScenarioRun> {
 }
 
 fn run_zsh_pretend() -> anyhow::Result<ScenarioRun> {
-    let mut session = spawn_session_with_cursor(
+    let mut session = spawn_session(
         CommandBuilder::new(ZSH_PRETEND_BIN),
-        TERMINAL_ROWS,
-        TERMINAL_COLS,
-        TERMINAL_ROWS,
-        1,
+        (TERMINAL_ROWS, TERMINAL_COLS),
+        Some((TERMINAL_ROWS, 1)),
     )?;
 
     wait_for_prompt(&session, |line| line.starts_with("❯❯ "))?;