diff --git a/src/common/mod.rs b/src/common/mod.rs index 0b55d3b9..e8883d4f 100644 --- a/src/common/mod.rs +++ b/src/common/mod.rs @@ -31,7 +31,7 @@ use crate::server::start_server; use command_is_executing::CommandIsExecuting; use errors::{AppContext, ContextType, ErrorContext, PluginContext, ScreenContext}; use input::handler::input_loop; -use os_input_output::{ClientOsApi, ServerOsApiInstruction}; +use os_input_output::{ClientOsApi, ServerOsApi, ServerOsApiInstruction}; use pty_bus::PtyInstruction; use screen::{Screen, ScreenInstruction}; use serde::{Deserialize, Serialize}; @@ -200,8 +200,12 @@ impl From for AppInstruction { /// Start Zellij with the specified [`OsApi`] and command-line arguments. // FIXME this should definitely be modularized and split into different functions. -pub fn start(mut os_input: Box, opts: CliArgs) { - let (ipc_thread, server_name) = start_server(opts.clone()); +pub fn start( + mut os_input: Box, + opts: CliArgs, + server_os_input: Box, +) { + let (ipc_thread, server_name) = start_server(server_os_input.clone(), opts.clone()); let take_snapshot = "\u{1b}[?1049h"; os_input.unset_raw_mode(0); diff --git a/src/common/os_input_output.rs b/src/common/os_input_output.rs index 5c0115bc..d0c13ccd 100644 --- a/src/common/os_input_output.rs +++ b/src/common/os_input_output.rs @@ -160,8 +160,8 @@ pub struct ServerOsInputOutput { orig_termios: Arc>, } -/// The `OsApi` trait represents an abstract interface to the features of an operating system that -/// Zellij requires. +/// The `ServerOsApi` trait represents an abstract interface to the features of an operating system that +/// Zellij server requires. pub trait ServerOsApi: Send + Sync { /// Sets the size of the terminal associated to file descriptor `fd`. fn set_terminal_size_using_fd(&mut self, fd: RawFd, cols: u16, rows: u16); @@ -234,8 +234,8 @@ pub struct ClientOsInputOutput { orig_termios: Arc>, } -/// The `OsApi` trait represents an abstract interface to the features of an operating system that -/// Zellij requires. +/// The `ClientOsApi` trait represents an abstract interface to the features of an operating system that +/// Zellij client requires. pub trait ClientOsApi: Send + Sync { /// Returns the size of the terminal associated to file descriptor `fd`. fn get_terminal_size_using_fd(&self, fd: RawFd) -> PositionAndSize; diff --git a/src/main.rs b/src/main.rs index c103085b..5c0049ec 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,7 +14,7 @@ use structopt::StructOpt; use crate::cli::CliArgs; use crate::command_is_executing::CommandIsExecuting; -use crate::os_input_output::get_client_os_input; +use crate::os_input_output::{get_client_os_input, get_server_os_input}; use crate::pty_bus::VteEvent; use crate::utils::{ consts::{ZELLIJ_TMP_DIR, ZELLIJ_TMP_LOG_DIR}, @@ -88,8 +88,9 @@ pub fn main() { .unwrap(); } else { let os_input = get_client_os_input(); + let server_os_input = get_server_os_input(); atomic_create_dir(ZELLIJ_TMP_DIR).unwrap(); atomic_create_dir(ZELLIJ_TMP_LOG_DIR).unwrap(); - start(Box::new(os_input), opts, config); + start(Box::new(os_input), opts, Box::new(server_os_input)); } } diff --git a/src/server/mod.rs b/src/server/mod.rs index 00368904..9ad2cbce 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -14,10 +14,12 @@ use std::path::PathBuf; use std::sync::mpsc::channel; use std::thread; -pub fn start_server(opts: CliArgs) -> (thread::JoinHandle<()>, String) { +pub fn start_server( + os_input: Box, + opts: CliArgs, +) -> (thread::JoinHandle<()>, String) { let (send_pty_instructions, receive_pty_instructions): ChannelWithContext = channel(); - let os_input = Box::new(get_server_os_input()); let mut send_pty_instructions = SenderWithContext::new( ErrorContext::new(), SenderType::Sender(send_pty_instructions), diff --git a/src/tests/fakes.rs b/src/tests/fakes.rs index 57f1ac95..a59bfa4a 100644 --- a/src/tests/fakes.rs +++ b/src/tests/fakes.rs @@ -13,7 +13,7 @@ use zellij_tile::data::Palette; use crate::tests::utils::commands::{QUIT, SLEEP}; -const MIN_TIME_BETWEEN_SNAPSHOTS: Duration = Duration::from_millis(300); +const MIN_TIME_BETWEEN_SNAPSHOTS: Duration = Duration::from_millis(350); #[derive(Clone)] pub enum IoEvent { diff --git a/src/tests/integration/basic.rs b/src/tests/integration/basic.rs index f785666a..75f96bda 100644 --- a/src/tests/integration/basic.rs +++ b/src/tests/integration/basic.rs @@ -26,11 +26,11 @@ pub fn starts_with_one_terminal() { ..Default::default() }; let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -53,11 +53,16 @@ pub fn split_terminals_vertically() { ..Default::default() }; let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[&PANE_MODE, &SPLIT_RIGHT_IN_PANE_MODE, &QUIT]); + fake_input_output.add_terminal_input(&[ + &COMMAND_TOGGLE, + &PANE_MODE, + &SPLIT_RIGHT_IN_PANE_MODE, + &QUIT, + ]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -80,11 +85,16 @@ pub fn split_terminals_horizontally() { ..Default::default() }; let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[&PANE_MODE, &SPLIT_DOWN_IN_PANE_MODE, &QUIT]); + fake_input_output.add_terminal_input(&[ + &COMMAND_TOGGLE, + &PANE_MODE, + &SPLIT_DOWN_IN_PANE_MODE, + &QUIT, + ]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -118,7 +128,7 @@ pub fn split_largest_terminal() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -141,11 +151,16 @@ pub fn cannot_split_terminals_vertically_when_active_terminal_is_too_small() { ..Default::default() }; let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[&PANE_MODE, &SPLIT_RIGHT_IN_PANE_MODE, &QUIT]); + fake_input_output.add_terminal_input(&[ + &COMMAND_TOGGLE, + &PANE_MODE, + &SPLIT_RIGHT_IN_PANE_MODE, + &QUIT, + ]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -168,11 +183,16 @@ pub fn cannot_split_terminals_horizontally_when_active_terminal_is_too_small() { ..Default::default() }; let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[&PANE_MODE, &SPLIT_DOWN_IN_PANE_MODE, &QUIT]); + fake_input_output.add_terminal_input(&[ + &COMMAND_TOGGLE, + &PANE_MODE, + &SPLIT_DOWN_IN_PANE_MODE, + &QUIT, + ]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -195,11 +215,16 @@ pub fn cannot_split_largest_terminal_when_there_is_no_room() { ..Default::default() }; let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[&PANE_MODE, &SPAWN_TERMINAL_IN_PANE_MODE, &QUIT]); + fake_input_output.add_terminal_input(&[ + &COMMAND_TOGGLE, + &PANE_MODE, + &SPAWN_TERMINAL_IN_PANE_MODE, + &QUIT, + ]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -234,7 +259,7 @@ pub fn scrolling_up_inside_a_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -271,78 +296,7 @@ pub fn scrolling_down_inside_a_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), - ); - let output_frames = fake_input_output - .stdout_writer - .output_frames - .lock() - .unwrap(); - let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size); - let snapshot_before_quit = - get_next_to_last_snapshot(snapshots).expect("could not find snapshot"); - assert_snapshot!(snapshot_before_quit); -} - -#[test] -pub fn scrolling_page_up_inside_a_pane() { - let fake_win_size = PositionAndSize { - columns: 121, - rows: 20, - x: 0, - y: 0, - ..Default::default() - }; - let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[ - &PANE_MODE, - &SPLIT_DOWN_IN_PANE_MODE, - &SPLIT_RIGHT_IN_PANE_MODE, - &SCROLL_MODE, - &SCROLL_PAGE_UP_IN_SCROLL_MODE, - &QUIT, - ]); - start( Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); - let output_frames = fake_input_output - .stdout_writer - .output_frames - .lock() - .unwrap(); - let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size); - let snapshot_before_quit = - get_next_to_last_snapshot(snapshots).expect("could not find snapshot"); - assert_snapshot!(snapshot_before_quit); -} - -#[test] -pub fn scrolling_page_down_inside_a_pane() { - let fake_win_size = PositionAndSize { - columns: 121, - rows: 20, - x: 0, - y: 0, - ..Default::default() - }; - let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[ - &PANE_MODE, - &SPLIT_DOWN_IN_PANE_MODE, - &SPLIT_RIGHT_IN_PANE_MODE, - &SCROLL_MODE, - &SCROLL_PAGE_UP_IN_SCROLL_MODE, - &SCROLL_PAGE_UP_IN_SCROLL_MODE, - &SCROLL_PAGE_DOWN_IN_SCROLL_MODE, - &SCROLL_PAGE_DOWN_IN_SCROLL_MODE, - &QUIT, - ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), ); let output_frames = fake_input_output .stdout_writer @@ -377,7 +331,11 @@ pub fn max_panes() { ]); let mut opts = CliArgs::default(); opts.max_panes = Some(4); - start(Box::new(fake_input_output.clone()), opts, Config::default()); + start( + Box::new(fake_input_output.clone()), + opts, + Box::new(fake_input_output.clone()), + ); let output_frames = fake_input_output .stdout_writer .output_frames @@ -409,7 +367,11 @@ pub fn toggle_focused_pane_fullscreen() { ]); let mut opts = CliArgs::default(); opts.max_panes = Some(4); - start(Box::new(fake_input_output.clone()), opts, Config::default()); + start( + Box::new(fake_input_output.clone()), + opts, + Box::new(fake_input_output.clone()), + ); let output_frames = fake_input_output .stdout_writer .output_frames diff --git a/src/tests/integration/close_pane.rs b/src/tests/integration/close_pane.rs index f73f4027..5feee241 100644 --- a/src/tests/integration/close_pane.rs +++ b/src/tests/integration/close_pane.rs @@ -43,7 +43,7 @@ pub fn close_pane_with_another_pane_above_it() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -85,7 +85,7 @@ pub fn close_pane_with_another_pane_below_it() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -124,7 +124,7 @@ pub fn close_pane_with_another_pane_to_the_left() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -164,7 +164,7 @@ pub fn close_pane_with_another_pane_to_the_right() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -209,7 +209,7 @@ pub fn close_pane_with_multiple_panes_above_it() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -252,7 +252,7 @@ pub fn close_pane_with_multiple_panes_below_it() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -297,7 +297,7 @@ pub fn close_pane_with_multiple_panes_to_the_left() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -340,7 +340,7 @@ pub fn close_pane_with_multiple_panes_to_the_right() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -405,7 +405,7 @@ pub fn close_pane_with_multiple_panes_above_it_away_from_screen_edges() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -466,7 +466,7 @@ pub fn close_pane_with_multiple_panes_below_it_away_from_screen_edges() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -529,7 +529,7 @@ pub fn close_pane_with_multiple_panes_to_the_left_away_from_screen_edges() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -592,7 +592,7 @@ pub fn close_pane_with_multiple_panes_to_the_right_away_from_screen_edges() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -628,7 +628,7 @@ pub fn closing_last_pane_exits_app() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output diff --git a/src/tests/integration/compatibility.rs b/src/tests/integration/compatibility.rs index ef93135e..8e9630d4 100644 --- a/src/tests/integration/compatibility.rs +++ b/src/tests/integration/compatibility.rs @@ -41,11 +41,11 @@ pub fn run_bandwhich_from_fish_shell() { }; let fixture_name = "fish_and_bandwhich"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -69,11 +69,11 @@ pub fn fish_tab_completion_options() { }; let fixture_name = "fish_tab_completion_options"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -102,11 +102,11 @@ pub fn fish_select_tab_completion_options() { }; let fixture_name = "fish_select_tab_completion_options"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -139,11 +139,11 @@ pub fn vim_scroll_region_down() { }; let fixture_name = "vim_scroll_region_down"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); // quit (ctrl-q) + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); // quit (ctrl-q) start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -173,11 +173,11 @@ pub fn vim_ctrl_d() { }; let fixture_name = "vim_ctrl_d"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -206,11 +206,11 @@ pub fn vim_ctrl_u() { }; let fixture_name = "vim_ctrl_u"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -234,11 +234,11 @@ pub fn htop() { }; let fixture_name = "htop"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -262,11 +262,11 @@ pub fn htop_scrolling() { }; let fixture_name = "htop_scrolling"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -290,11 +290,11 @@ pub fn htop_right_scrolling() { }; let fixture_name = "htop_right_scrolling"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -326,11 +326,11 @@ pub fn vim_overwrite() { }; let fixture_name = "vim_overwrite"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -357,11 +357,11 @@ pub fn clear_scroll_region() { }; let fixture_name = "clear_scroll_region"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -385,11 +385,11 @@ pub fn display_tab_characters_properly() { }; let fixture_name = "tab_characters"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -413,11 +413,11 @@ pub fn neovim_insert_mode() { }; let fixture_name = "nvim_insert"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -443,11 +443,11 @@ pub fn bash_cursor_linewrap() { }; let fixture_name = "bash_cursor_linewrap"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -473,11 +473,11 @@ pub fn fish_paste_multiline() { }; let fixture_name = "fish_paste_multiline"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -501,11 +501,11 @@ pub fn git_log() { }; let fixture_name = "git_log"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -531,11 +531,11 @@ pub fn git_diff_scrollup() { }; let fixture_name = "git_diff_scrollup"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -559,11 +559,11 @@ pub fn emacs_longbuf() { }; let fixture_name = "emacs_longbuf_tutorial"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -587,11 +587,11 @@ pub fn top_and_quit() { }; let fixture_name = "top_and_quit"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer @@ -621,11 +621,11 @@ pub fn exa_plus_omf_theme() { }; let fixture_name = "exa_plus_omf_theme"; let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name); - fake_input_output.add_terminal_input(&[&QUIT]); + fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &QUIT]); start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output .stdout_writer diff --git a/src/tests/integration/layouts.rs b/src/tests/integration/layouts.rs index a2ac4702..753453c9 100644 --- a/src/tests/integration/layouts.rs +++ b/src/tests/integration/layouts.rs @@ -28,7 +28,11 @@ pub fn accepts_basic_layout() { "src/tests/fixtures/layouts/three-panes-with-nesting.yaml", )); - start(Box::new(fake_input_output.clone()), opts, Config::default()); + start( + Box::new(fake_input_output.clone()), + opts, + Box::new(fake_input_output.clone()), + ); let output_frames = fake_input_output .stdout_writer .output_frames diff --git a/src/tests/integration/move_focus_down.rs b/src/tests/integration/move_focus_down.rs index 21fa7925..ca487be5 100644 --- a/src/tests/integration/move_focus_down.rs +++ b/src/tests/integration/move_focus_down.rs @@ -35,7 +35,7 @@ pub fn move_focus_down() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -71,7 +71,7 @@ pub fn move_focus_down_to_the_most_recently_used_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output diff --git a/src/tests/integration/move_focus_left.rs b/src/tests/integration/move_focus_left.rs index 6441357d..60f89ffd 100644 --- a/src/tests/integration/move_focus_left.rs +++ b/src/tests/integration/move_focus_left.rs @@ -34,7 +34,7 @@ pub fn move_focus_left() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -71,7 +71,7 @@ pub fn move_focus_left_to_the_most_recently_used_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output diff --git a/src/tests/integration/move_focus_right.rs b/src/tests/integration/move_focus_right.rs index bc4f551c..22f09136 100644 --- a/src/tests/integration/move_focus_right.rs +++ b/src/tests/integration/move_focus_right.rs @@ -35,7 +35,7 @@ pub fn move_focus_right() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -71,7 +71,7 @@ pub fn move_focus_right_to_the_most_recently_used_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output diff --git a/src/tests/integration/move_focus_up.rs b/src/tests/integration/move_focus_up.rs index 77f06703..4f0416d4 100644 --- a/src/tests/integration/move_focus_up.rs +++ b/src/tests/integration/move_focus_up.rs @@ -34,7 +34,7 @@ pub fn move_focus_up() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -71,7 +71,7 @@ pub fn move_focus_up_to_the_most_recently_used_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output diff --git a/src/tests/integration/resize_down.rs b/src/tests/integration/resize_down.rs index d5ad4ef8..850f6807 100644 --- a/src/tests/integration/resize_down.rs +++ b/src/tests/integration/resize_down.rs @@ -43,11 +43,7 @@ pub fn resize_down_with_pane_above() { &SLEEP, &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -87,11 +83,7 @@ pub fn resize_down_with_pane_below() { &SLEEP, &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -137,11 +129,7 @@ pub fn resize_down_with_panes_above_and_below() { &SLEEP, &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -186,11 +174,7 @@ pub fn resize_down_with_multiple_panes_above() { &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -237,11 +221,7 @@ pub fn resize_down_with_panes_above_aligned_left_with_current_pane() { &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -287,11 +267,7 @@ pub fn resize_down_with_panes_below_aligned_left_with_current_pane() { &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -335,11 +311,7 @@ pub fn resize_down_with_panes_above_aligned_right_with_current_pane() { &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -384,11 +356,7 @@ pub fn resize_down_with_panes_below_aligned_right_with_current_pane() { &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -436,11 +404,7 @@ pub fn resize_down_with_panes_above_aligned_left_and_right_with_current_pane() { &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -490,11 +454,7 @@ pub fn resize_down_with_panes_below_aligned_left_and_right_with_current_pane() { &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -561,11 +521,7 @@ pub fn resize_down_with_panes_above_aligned_left_and_right_with_panes_to_the_lef &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -634,11 +590,7 @@ pub fn resize_down_with_panes_below_aligned_left_and_right_with_to_the_left_and_ &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer @@ -675,11 +627,7 @@ pub fn cannot_resize_down_when_pane_below_is_at_minimum_height() { &SLEEP, &QUIT, ]); - start( - Box::new(fake_input_output.clone()), - CliArgs::default(), - Config::default(), - ); + start(Box::new(fake_input_output.clone()), CliArgs::default(), Box::new(fake_input_output.clone())); let output_frames = fake_input_output .stdout_writer diff --git a/src/tests/integration/resize_left.rs b/src/tests/integration/resize_left.rs index 2444f3a1..307198b1 100644 --- a/src/tests/integration/resize_left.rs +++ b/src/tests/integration/resize_left.rs @@ -42,7 +42,7 @@ pub fn resize_left_with_pane_to_the_left() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -84,7 +84,7 @@ pub fn resize_left_with_pane_to_the_right() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -128,7 +128,7 @@ pub fn resize_left_with_panes_to_the_left_and_right() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -175,7 +175,7 @@ pub fn resize_left_with_multiple_panes_to_the_left() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -224,7 +224,7 @@ pub fn resize_left_with_panes_to_the_left_aligned_top_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -270,7 +270,7 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -318,7 +318,7 @@ pub fn resize_left_with_panes_to_the_left_aligned_bottom_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -365,7 +365,7 @@ pub fn resize_left_with_panes_to_the_right_aligned_bottom_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -417,7 +417,7 @@ pub fn resize_left_with_panes_to_the_left_aligned_top_and_bottom_with_current_pa start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -471,7 +471,7 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_and_bottom_with_current_p start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -542,7 +542,7 @@ pub fn resize_left_with_panes_to_the_left_aligned_top_and_bottom_with_panes_abov start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -616,7 +616,7 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_and_bottom_with_panes_abo start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -657,7 +657,7 @@ pub fn cannot_resize_left_when_pane_to_the_left_is_at_minimum_width() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output diff --git a/src/tests/integration/resize_right.rs b/src/tests/integration/resize_right.rs index 3f242f5a..05553de1 100644 --- a/src/tests/integration/resize_right.rs +++ b/src/tests/integration/resize_right.rs @@ -42,7 +42,7 @@ pub fn resize_right_with_pane_to_the_left() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -84,7 +84,7 @@ pub fn resize_right_with_pane_to_the_right() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -128,7 +128,7 @@ pub fn resize_right_with_panes_to_the_left_and_right() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -175,7 +175,7 @@ pub fn resize_right_with_multiple_panes_to_the_left() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -224,7 +224,7 @@ pub fn resize_right_with_panes_to_the_left_aligned_top_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -270,7 +270,7 @@ pub fn resize_right_with_panes_to_the_right_aligned_top_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -318,7 +318,7 @@ pub fn resize_right_with_panes_to_the_left_aligned_bottom_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -365,7 +365,7 @@ pub fn resize_right_with_panes_to_the_right_aligned_bottom_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -417,7 +417,7 @@ pub fn resize_right_with_panes_to_the_left_aligned_top_and_bottom_with_current_p start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -471,7 +471,7 @@ pub fn resize_right_with_panes_to_the_right_aligned_top_and_bottom_with_current_ start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -542,7 +542,7 @@ pub fn resize_right_with_panes_to_the_left_aligned_top_and_bottom_with_panes_abo start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -615,7 +615,7 @@ pub fn resize_right_with_panes_to_the_right_aligned_top_and_bottom_with_panes_ab start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -656,7 +656,7 @@ pub fn cannot_resize_right_when_pane_to_the_left_is_at_minimum_width() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output diff --git a/src/tests/integration/resize_up.rs b/src/tests/integration/resize_up.rs index e2d0c4ba..6330b074 100644 --- a/src/tests/integration/resize_up.rs +++ b/src/tests/integration/resize_up.rs @@ -44,7 +44,7 @@ pub fn resize_up_with_pane_above() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -88,7 +88,7 @@ pub fn resize_up_with_pane_below() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -137,7 +137,7 @@ pub fn resize_up_with_panes_above_and_below() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -185,7 +185,7 @@ pub fn resize_up_with_multiple_panes_above() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -234,7 +234,7 @@ pub fn resize_up_with_panes_above_aligned_left_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -284,7 +284,7 @@ pub fn resize_up_with_panes_below_aligned_left_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -332,7 +332,7 @@ pub fn resize_up_with_panes_above_aligned_right_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -381,7 +381,7 @@ pub fn resize_up_with_panes_below_aligned_right_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -433,7 +433,7 @@ pub fn resize_up_with_panes_above_aligned_left_and_right_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -487,7 +487,7 @@ pub fn resize_up_with_panes_below_aligned_left_and_right_with_current_pane() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -558,7 +558,7 @@ pub fn resize_up_with_panes_above_aligned_left_and_right_with_panes_to_the_left_ start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -631,7 +631,7 @@ pub fn resize_up_with_panes_below_aligned_left_and_right_with_to_the_left_and_ri start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -672,7 +672,7 @@ pub fn cannot_resize_up_when_pane_above_is_at_minimum_height() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output diff --git a/src/tests/integration/tabs.rs b/src/tests/integration/tabs.rs index f62ad0c4..d45ec18a 100644 --- a/src/tests/integration/tabs.rs +++ b/src/tests/integration/tabs.rs @@ -36,7 +36,7 @@ pub fn open_new_tab() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -71,7 +71,7 @@ pub fn switch_to_prev_tab() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -106,7 +106,7 @@ pub fn switch_to_next_tab() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -141,7 +141,7 @@ pub fn close_tab() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -177,7 +177,7 @@ pub fn close_last_pane_in_a_tab() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -215,7 +215,7 @@ pub fn close_the_middle_tab() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -258,7 +258,7 @@ pub fn close_the_tab_that_has_a_pane_in_fullscreen() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -293,7 +293,7 @@ pub fn closing_last_tab_exits_the_app() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output diff --git a/src/tests/integration/toggle_fullscreen.rs b/src/tests/integration/toggle_fullscreen.rs index 9fd22144..83a8f215 100644 --- a/src/tests/integration/toggle_fullscreen.rs +++ b/src/tests/integration/toggle_fullscreen.rs @@ -35,7 +35,7 @@ pub fn adding_new_terminal_in_fullscreen() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output @@ -69,7 +69,7 @@ pub fn move_focus_is_disabled_in_fullscreen() { start( Box::new(fake_input_output.clone()), CliArgs::default(), - Config::default(), + Box::new(fake_input_output.clone()), ); let output_frames = fake_input_output