diff options
author | a-kenji <aks.kenji@protonmail.com> | 2021-06-14 22:05:25 +0200 |
---|---|---|
committer | a-kenji <aks.kenji@protonmail.com> | 2021-06-14 22:05:25 +0200 |
commit | 4743b7e7ab803b16cc703d2238068647857295c5 (patch) | |
tree | 297041fe76ca6fdeff65f4812f81e562e2cc2a96 /src | |
parent | cafcca0c57696968b609c4f4a8c7a6fe7f2909a8 (diff) | |
parent | 7f67e6d97f158a00d1f2c21326fe320388ec8446 (diff) |
Merge branch 'main' of https://github.com/zellij-org/zellij into layout-error
Diffstat (limited to 'src')
-rw-r--r-- | src/install.rs | 1 | ||||
-rw-r--r-- | src/tests/integration/basic.rs | 28 | ||||
-rw-r--r-- | src/tests/integration/close_pane.rs | 26 | ||||
-rw-r--r-- | src/tests/integration/compatibility.rs | 42 | ||||
-rw-r--r-- | src/tests/integration/layouts.rs | 2 | ||||
-rw-r--r-- | src/tests/integration/move_focus_down.rs | 4 | ||||
-rw-r--r-- | src/tests/integration/move_focus_left.rs | 6 | ||||
-rw-r--r-- | src/tests/integration/move_focus_right.rs | 6 | ||||
-rw-r--r-- | src/tests/integration/move_focus_up.rs | 4 | ||||
-rw-r--r-- | src/tests/integration/resize_down.rs | 26 | ||||
-rw-r--r-- | src/tests/integration/resize_left.rs | 26 | ||||
-rw-r--r-- | src/tests/integration/resize_right.rs | 26 | ||||
-rw-r--r-- | src/tests/integration/resize_up.rs | 26 | ||||
-rw-r--r-- | src/tests/integration/tabs.rs | 16 | ||||
-rw-r--r-- | src/tests/integration/terminal_window_resize.rs | 16 | ||||
-rw-r--r-- | src/tests/integration/toggle_fullscreen.rs | 4 |
16 files changed, 130 insertions, 129 deletions
diff --git a/src/install.rs b/src/install.rs index e9f58a8b9..4fb693763 100644 --- a/src/install.rs +++ b/src/install.rs @@ -19,6 +19,7 @@ pub(crate) fn populate_data_dir(data_dir: &Path) { let mut assets = asset_map! { "assets/layouts/default.yaml" => "layouts/default.yaml", "assets/layouts/strider.yaml" => "layouts/strider.yaml", + "assets/layouts/disable-status-bar.yaml" => "layouts/disable-status-bar.yaml", }; assets.extend(asset_map! { "assets/plugins/status-bar.wasm" => "plugins/status-bar.wasm", diff --git a/src/tests/integration/basic.rs b/src/tests/integration/basic.rs index bd1787019..98f77988d 100644 --- a/src/tests/integration/basic.rs +++ b/src/tests/integration/basic.rs @@ -20,7 +20,7 @@ fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { #[test] pub fn starts_with_one_terminal() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -49,7 +49,7 @@ pub fn starts_with_one_terminal() { #[test] pub fn split_terminals_vertically() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -78,7 +78,7 @@ pub fn split_terminals_vertically() { #[test] pub fn split_terminals_horizontally() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -108,7 +108,7 @@ pub fn split_terminals_horizontally() { pub fn split_largest_terminal() { // this finds the largest pane and splits along its longest edge (vertically or horizontally) let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -143,7 +143,7 @@ pub fn split_largest_terminal() { #[test] pub fn cannot_split_terminals_vertically_when_active_terminal_is_too_small() { let fake_win_size = PositionAndSize { - columns: 8, + cols: 8, rows: 20, x: 0, y: 0, @@ -172,7 +172,7 @@ pub fn cannot_split_terminals_vertically_when_active_terminal_is_too_small() { #[test] pub fn cannot_split_terminals_horizontally_when_active_terminal_is_too_small() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 4, x: 0, y: 0, @@ -201,7 +201,7 @@ pub fn cannot_split_terminals_horizontally_when_active_terminal_is_too_small() { #[test] pub fn cannot_split_largest_terminal_when_there_is_no_room() { let fake_win_size = PositionAndSize { - columns: 8, + cols: 8, rows: 4, x: 0, y: 0, @@ -230,7 +230,7 @@ pub fn cannot_split_largest_terminal_when_there_is_no_room() { #[test] pub fn scrolling_up_inside_a_pane() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -267,7 +267,7 @@ pub fn scrolling_up_inside_a_pane() { #[test] pub fn scrolling_down_inside_a_pane() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -306,7 +306,7 @@ pub fn scrolling_down_inside_a_pane() { #[test] pub fn scrolling_page_up_inside_a_pane() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -342,7 +342,7 @@ pub fn scrolling_page_up_inside_a_pane() { #[test] pub fn scrolling_page_down_inside_a_pane() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -383,7 +383,7 @@ pub fn max_panes() { // with the --max-panes option, we only allow a certain amount of panes on screen // simultaneously, new panes beyond this limit will close older panes on screen let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -421,7 +421,7 @@ pub fn max_panes() { #[test] pub fn toggle_focused_pane_fullscreen() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -465,7 +465,7 @@ pub fn bracketed_paste() { // since it's inside a bracketed paste block, while the "QUIT" command is, since it is already // past the block let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, diff --git a/src/tests/integration/close_pane.rs b/src/tests/integration/close_pane.rs index b9af7bccc..4618d3e65 100644 --- a/src/tests/integration/close_pane.rs +++ b/src/tests/integration/close_pane.rs @@ -28,7 +28,7 @@ pub fn close_pane_with_another_pane_above_it() { // └───────────┘ └───────────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -71,7 +71,7 @@ pub fn close_pane_with_another_pane_below_it() { // └───────────┘ └───────────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -113,7 +113,7 @@ pub fn close_pane_with_another_pane_to_the_left() { // └─────┴─────┘ └──────────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -154,7 +154,7 @@ pub fn close_pane_with_another_pane_to_the_right() { // └─────┴─────┘ └──────────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -198,7 +198,7 @@ pub fn close_pane_with_multiple_panes_above_it() { // └───────────┘ └─────┴─────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -245,7 +245,7 @@ pub fn close_pane_with_multiple_panes_below_it() { // └─────┴─────┘ └─────┴─────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -290,7 +290,7 @@ pub fn close_pane_with_multiple_panes_to_the_left() { // └─────┴─────┘ └──────────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -337,7 +337,7 @@ pub fn close_pane_with_multiple_panes_to_the_right() { // └─────┴─────┘ └──────────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -382,7 +382,7 @@ pub fn close_pane_with_multiple_panes_above_it_away_from_screen_edges() { // └───┴───────┴───┘ └───┴───┴───┴───┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -450,7 +450,7 @@ pub fn close_pane_with_multiple_panes_below_it_away_from_screen_edges() { // └───┴───┴───┴───┘ └───┴───┴───┴───┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -516,7 +516,7 @@ pub fn close_pane_with_multiple_panes_to_the_left_away_from_screen_edges() { // └────┴──────┘ └────┴──────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 30, x: 0, y: 0, @@ -582,7 +582,7 @@ pub fn close_pane_with_multiple_panes_to_the_right_away_from_screen_edges() { // └────┴──────┘ └────┴──────┘ // █ == pane being closed let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 30, x: 0, y: 0, @@ -638,7 +638,7 @@ pub fn close_pane_with_multiple_panes_to_the_right_away_from_screen_edges() { #[test] pub fn closing_last_pane_exits_app() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, diff --git a/src/tests/integration/compatibility.rs b/src/tests/integration/compatibility.rs index d3bbccba0..0930271f7 100644 --- a/src/tests/integration/compatibility.rs +++ b/src/tests/integration/compatibility.rs @@ -27,14 +27,14 @@ use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize, fixture_name: &str) -> FakeInputOutput { let mut tty_inputs = HashMap::new(); let fixture_bytes = Bytes::from_file_in_fixtures(&fixture_name); - tty_inputs.insert(fake_win_size.columns as u16, fixture_bytes); + tty_inputs.insert(fake_win_size.cols as u16, fixture_bytes); FakeInputOutput::new(fake_win_size.clone()).with_tty_inputs(tty_inputs) } #[test] pub fn run_bandwhich_from_fish_shell() { let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -65,7 +65,7 @@ pub fn run_bandwhich_from_fish_shell() { #[test] pub fn fish_tab_completion_options() { let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -100,7 +100,7 @@ pub fn fish_select_tab_completion_options() { // this is not clearly seen in the snapshot because it does not include styles, // but we can see the command line change and the cursor staying in place let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -139,7 +139,7 @@ pub fn vim_scroll_region_down() { // file // experience appear to the user let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -175,7 +175,7 @@ pub fn vim_ctrl_d() { // end of the scroll region // vim makes sure to fill these empty lines with the rest of the file let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -210,7 +210,7 @@ pub fn vim_ctrl_u() { // this causes the effect of scrolling up X lines (vim replaces the lines with the ones in the // file above the current content) let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -240,7 +240,7 @@ pub fn vim_ctrl_u() { #[test] pub fn htop() { let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -270,7 +270,7 @@ pub fn htop() { #[test] pub fn htop_scrolling() { let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -300,7 +300,7 @@ pub fn htop_scrolling() { #[test] pub fn htop_right_scrolling() { let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -338,7 +338,7 @@ pub fn vim_overwrite() { // * confirm you would like to change the file by pressing 'y' and then ENTER // * if everything looks fine, this test passed :) let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -371,7 +371,7 @@ pub fn clear_scroll_region() { // this means that when vim exits, we get back the previous scroll // buffer let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -401,7 +401,7 @@ pub fn clear_scroll_region() { #[test] pub fn display_tab_characters_properly() { let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -431,7 +431,7 @@ pub fn display_tab_characters_properly() { #[test] pub fn neovim_insert_mode() { let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -463,7 +463,7 @@ pub fn bash_cursor_linewrap() { // this test makes sure that when we enter a command that is beyond the screen border, that it // immediately goes down one line let fake_win_size = PositionAndSize { - columns: 116, + cols: 116, rows: 28, x: 0, y: 0, @@ -495,7 +495,7 @@ pub fn fish_paste_multiline() { // here we paste a multiline command in fish shell, making sure we support it // going up and changing the colors of our line-wrapped pasted text let fake_win_size = PositionAndSize { - columns: 149, + cols: 149, rows: 28, x: 0, y: 0, @@ -525,7 +525,7 @@ pub fn fish_paste_multiline() { #[test] pub fn git_log() { let fake_win_size = PositionAndSize { - columns: 149, + cols: 149, rows: 28, x: 0, y: 0, @@ -557,7 +557,7 @@ pub fn git_diff_scrollup() { // this tests makes sure that when we have a git diff that exceeds the screen size // we are able to scroll up let fake_win_size = PositionAndSize { - columns: 149, + cols: 149, rows: 28, x: 0, y: 0, @@ -587,7 +587,7 @@ pub fn git_diff_scrollup() { #[test] pub fn emacs_longbuf() { let fake_win_size = PositionAndSize { - columns: 284, + cols: 284, rows: 60, x: 0, y: 0, @@ -617,7 +617,7 @@ pub fn emacs_longbuf() { #[test] pub fn top_and_quit() { let fake_win_size = PositionAndSize { - columns: 235, + cols: 235, rows: 56, x: 0, y: 0, @@ -653,7 +653,7 @@ pub fn exa_plus_omf_theme() { // over existing on-screen content without deleting it, so we must // convert it to spaces let fake_win_size = PositionAndSize { - columns: 235, + cols: 235, rows: 56, x: 0, y: 0, diff --git a/src/tests/integration/layouts.rs b/src/tests/integration/layouts.rs index 9a97170bb..29f8beac7 100644 --- a/src/tests/integration/layouts.rs +++ b/src/tests/integration/layouts.rs @@ -16,7 +16,7 @@ fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { #[test] pub fn accepts_basic_layout() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, diff --git a/src/tests/integration/move_focus_down.rs b/src/tests/integration/move_focus_down.rs index 507897394..4b8410f8e 100644 --- a/src/tests/integration/move_focus_down.rs +++ b/src/tests/integration/move_focus_down.rs @@ -19,7 +19,7 @@ fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { #[test] pub fn move_focus_down() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -55,7 +55,7 @@ pub fn move_focus_down() { #[test] pub fn move_focus_down_to_the_most_recently_used_pane() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, diff --git a/src/tests/integration/move_focus_left.rs b/src/tests/integration/move_focus_left.rs index d33ccffab..aac3ea07c 100644 --- a/src/tests/integration/move_focus_left.rs +++ b/src/tests/integration/move_focus_left.rs @@ -20,7 +20,7 @@ fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { #[test] pub fn move_focus_left() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -55,7 +55,7 @@ pub fn move_focus_left() { #[test] pub fn move_focus_left_to_the_most_recently_used_pane() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -94,7 +94,7 @@ pub fn move_focus_left_to_the_most_recently_used_pane() { #[test] pub fn move_focus_left_changes_tab() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, diff --git a/src/tests/integration/move_focus_right.rs b/src/tests/integration/move_focus_right.rs index 62e2a0dfa..05421998a 100644 --- a/src/tests/integration/move_focus_right.rs +++ b/src/tests/integration/move_focus_right.rs @@ -20,7 +20,7 @@ fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { #[test] pub fn move_focus_right() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -56,7 +56,7 @@ pub fn move_focus_right() { #[test] pub fn move_focus_right_to_the_most_recently_used_pane() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -94,7 +94,7 @@ pub fn move_focus_right_to_the_most_recently_used_pane() { #[test] pub fn move_focus_right_changes_tab() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, diff --git a/src/tests/integration/move_focus_up.rs b/src/tests/integration/move_focus_up.rs index 17dced0bd..cd9bd48cf 100644 --- a/src/tests/integration/move_focus_up.rs +++ b/src/tests/integration/move_focus_up.rs @@ -19,7 +19,7 @@ fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { #[test] pub fn move_focus_up() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -54,7 +54,7 @@ pub fn move_focus_up() { #[test] pub fn move_focus_up_to_the_most_recently_used_pane() { let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, diff --git a/src/tests/integration/resize_down.rs b/src/tests/integration/resize_down.rs index ee439b630..110f0e49a 100644 --- a/src/tests/integration/resize_down.rs +++ b/src/tests/integration/resize_down.rs @@ -29,7 +29,7 @@ pub fn resize_down_with_pane_above() { // └───────────┘ └───────────┘ // █ == focused pane let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -74,7 +74,7 @@ pub fn resize_down_with_pane_below() { // └───────────┘ └───────────┘ // █ == focused pane let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -124,7 +124,7 @@ pub fn resize_down_with_panes_above_and_below() { // └───────────┘ └───────────┘ // █ == focused pane let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 25, x: 0, y: 0, @@ -172,7 +172,7 @@ pub fn resize_down_with_multiple_panes_above() { // └───────────┘ └───────────┘ // █ == focused pane let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -223,7 +223,7 @@ pub fn resize_down_with_panes_above_aligned_left_with_current_pane() { // └─────┴─────┘ └─────┴─────┘ // █ == focused pane let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -276,7 +276,7 @@ pub fn resize_down_with_panes_below_aligned_left_with_current_pane() { // └─────┴─────┘ └─────┴─────┘ // █ == focused pane let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -328,7 +328,7 @@ pub fn resize_down_with_panes_above_aligned_right_with_current_pane() { // └─────┴─────┘ └─────┴─────┘ // █ == focused pane let fake_win_size = PositionAndSize { - columns: 121, + cols: 121, rows: 20, x: 0, y: 0, @@ -378,7 +378,7 @@ pub fn resize_down_with_panes_below_aligned_right_with |