fix tests

1 files changed, 49 insertions, 87 deletions

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