diff options
| author | Aram Drevekenin <aram@poor.dev> | 2024-07-05 15:13:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-05 15:13:51 +0200 |
| commit | a6d6c0e4ff03c35cafb6f04363ecab856ee3682d (patch) | |
| tree | eadf1c24c4c6a1e4b7499b3cd047351fd29e52de /src | |
| parent | docs(changelog): wasmer -> wasmtime (diff) | |
| download | sl0ppij-a6d6c0e4ff03c35cafb6f04363ecab856ee3682d.tar.gz sl0ppij-a6d6c0e4ff03c35cafb6f04363ecab856ee3682d.tar.xz sl0ppij-a6d6c0e4ff03c35cafb6f04363ecab856ee3682d.zip | |
feat(ui): status bar redesign (#3475)
* work
* work
* working
* get default mode from server and some ui responsiveness
* work
* finish design and get tests to pass
* get e2e tests to pass
* add classic layout
* add classic layout assets
* fix e2e tests
* style(fmt): rustfmt
* fix plugin system test
* style(fmt): some cleanups
Diffstat (limited to 'src')
39 files changed, 198 insertions, 185 deletions
diff --git a/src/tests/e2e/cases.rs b/src/tests/e2e/cases.rs index 9687d53c..eec66096 100644 --- a/src/tests/e2e/cases.rs +++ b/src/tests/e2e/cases.rs @@ -100,7 +100,7 @@ fn account_for_races_in_snapshot(snapshot: String) -> String { // to fix this, we should set plugins as unselectable in the layout (before they are loaded), // once that happens, we should be able to remove this hack (and adjust the snapshots for the // trailing spaces that we had to get rid of here) - let base_replace = Regex::new(r" BASE \s*\n").unwrap(); + let base_replace = Regex::new(r"Alt <\[\]> BASE \s*\n").unwrap(); let eol_arrow_replace = Regex::new(r"\s*\n").unwrap(); let snapshot = base_replace.replace_all(&snapshot, "\n").to_string(); let snapshot = eol_arrow_replace.replace_all(&snapshot, "\n").to_string(); @@ -134,6 +134,7 @@ pub fn starts_with_one_terminal() { }, }); if runner.test_timed_out && test_attempts > 0 { + test_attempts -= 1; continue; } else { break last_snapshot; @@ -175,7 +176,8 @@ pub fn split_terminals_vertically() { name: "Wait for new pane to appear", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane step_is_complete = true; } @@ -219,12 +221,7 @@ pub fn cannot_split_terminals_vertically_when_active_terminal_is_too_small() { name: "Make sure only one pane appears", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(3, 2) - //two empty lines at the bottom to make sure there is no plugin output - && remote_terminal - .current_snapshot() - .ends_with(" \n ") - { + if remote_terminal.cursor_position_is(3, 2) { // ... is the truncated tip line step_is_complete = true; } @@ -272,7 +269,9 @@ pub fn scrolling_inside_a_pane() { name: "Fill terminal with text", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane remote_terminal.load_fixture("e2e/scrolling_inside_a_pane"); step_is_complete = true; @@ -284,7 +283,7 @@ pub fn scrolling_inside_a_pane() { name: "Scroll up inside pane", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 20) + if remote_terminal.cursor_position_is(63, 21) && remote_terminal.snapshot_contains("line21") { // all lines have been written to the pane @@ -301,9 +300,9 @@ pub fn scrolling_inside_a_pane() { name: "Wait for scroll to finish", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 20) + if remote_terminal.cursor_position_is(63, 21) && remote_terminal.snapshot_contains("line3 ") - && remote_terminal.snapshot_contains("SCROLL: 1/4") + && remote_terminal.snapshot_contains("SCROLL: 1/3") { // keyboard scrolls up 1 line, scrollback is 4 lines: cat command + 2 extra lines from fixture + prompt step_is_complete = true; @@ -352,7 +351,9 @@ pub fn toggle_pane_fullscreen() { name: "Change newly opened pane to be fullscreen", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane remote_terminal.send_key(&PANE_MODE); std::thread::sleep(std::time::Duration::from_millis(100)); @@ -415,7 +416,9 @@ pub fn open_new_tab() { name: "Open new tab", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane remote_terminal.send_key(&TAB_MODE); std::thread::sleep(std::time::Duration::from_millis(100)); @@ -431,7 +434,6 @@ pub fn open_new_tab() { instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; if remote_terminal.cursor_position_is(3, 2) - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #2") && remote_terminal.status_bar_appears() { @@ -482,7 +484,9 @@ pub fn close_tab() { name: "Open new tab", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane remote_terminal.send_key(&TAB_MODE); std::thread::sleep(std::time::Duration::from_millis(100)); @@ -497,7 +501,6 @@ pub fn close_tab() { instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; if remote_terminal.cursor_position_is(3, 2) - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #2") && remote_terminal.status_bar_appears() { @@ -675,7 +678,9 @@ pub fn close_pane() { name: "Close pane", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane remote_terminal.send_key(&PANE_MODE); std::thread::sleep(std::time::Duration::from_millis(100)); @@ -690,7 +695,8 @@ pub fn close_pane() { name: "Wait for pane to close", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(3, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(3, 2) && remote_terminal.status_bar_appears() + { // cursor is in the original pane step_is_complete = true; } @@ -820,7 +826,9 @@ pub fn typing_exit_closes_pane() { name: "Type exit", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { remote_terminal.send_key("e".as_bytes()); std::thread::sleep(std::time::Duration::from_millis(100)); remote_terminal.send_key("x".as_bytes()); @@ -840,8 +848,8 @@ pub fn typing_exit_closes_pane() { name: "Wait for pane to close", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - // if remote_terminal.cursor_position_is(3, 2) && remote_terminal.tip_appears() { - if remote_terminal.cursor_position_is(3, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(3, 2) && remote_terminal.status_bar_appears() + { // cursor is in the original pane step_is_complete = true; } @@ -889,7 +897,9 @@ pub fn resize_pane() { name: "Resize pane", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane remote_terminal.send_key(&RESIZE_MODE); std::thread::sleep(std::time::Duration::from_millis(100)); @@ -906,7 +916,8 @@ pub fn resize_pane() { name: "Wait for pane to be resized", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(57, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(57, 2) && remote_terminal.status_bar_appears() + { // pane has been resized step_is_complete = true; } @@ -952,7 +963,7 @@ pub fn lock_mode() { name: "Send keys that should not be intercepted by the app", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.snapshot_contains("INTERFACE LOCKED") { + if !remote_terminal.snapshot_contains("PANE") { remote_terminal.send_key(&TAB_MODE); std::thread::sleep(std::time::Duration::from_millis(100)); remote_terminal.send_key(&NEW_TAB_IN_TAB_MODE); @@ -1017,7 +1028,9 @@ pub fn resize_terminal_window() { name: "Change terminal window size", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { // new pane has been opened and focused remote_terminal.change_size(100, 24); step_is_complete = true; @@ -1031,7 +1044,7 @@ pub fn resize_terminal_window() { instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; if remote_terminal.cursor_position_is(53, 2) - && remote_terminal.tip_appears() + && remote_terminal.status_bar_appears() && remote_terminal.snapshot_contains("Ctrl +") { // size has been changed @@ -1081,7 +1094,9 @@ pub fn detach_and_attach_session() { name: "Send some text to the active pane", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { // new pane has been opened and focused remote_terminal.send_key("I am some text".as_bytes()); step_is_complete = true; @@ -1275,7 +1290,9 @@ pub fn status_bar_loads_custom_keybindings() { name: "Wait for app to load", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(3, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(3, 2) + && remote_terminal.snapshot_contains("LOCK") + { step_is_complete = true; } step_is_complete @@ -1323,7 +1340,9 @@ fn focus_pane_with_mouse() { name: "Click left pane", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { remote_terminal.send_key(&sgr_mouse_report(Position::new(5, 2), 0)); step_is_complete = true; } @@ -1335,7 +1354,8 @@ fn focus_pane_with_mouse() { name: "Wait for left pane to be focused", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(3, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(3, 2) && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane step_is_complete = true; } @@ -1383,7 +1403,9 @@ pub fn scrolling_inside_a_pane_with_mouse() { name: "Fill terminal with text", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { remote_terminal.load_fixture("e2e/scrolling_inside_a_pane"); step_is_complete = true; } @@ -1394,7 +1416,7 @@ pub fn scrolling_inside_a_pane_with_mouse() { name: "Scroll up inside pane", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 20) + if remote_terminal.cursor_position_is(63, 21) && remote_terminal.snapshot_contains("line21") { // all lines have been written to the pane @@ -1409,11 +1431,10 @@ pub fn scrolling_inside_a_pane_with_mouse() { name: "Wait for scroll to finish", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 20) + if remote_terminal.cursor_position_is(63, 21) && remote_terminal.snapshot_contains("line1 ") - && remote_terminal.snapshot_contains("SCROLL: 3/4") + && remote_terminal.snapshot_contains("SCROLL: 3/3") { - // mouse wheel scrolls up 3 lines, scrollback is 4 lines: cat command + 2 extra lines from fixture + prompt step_is_complete = true; } step_is_complete @@ -1460,7 +1481,8 @@ pub fn start_without_pane_frames() { name: "Wait for new pane to appear", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(62, 1) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(62, 1) && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane step_is_complete = true; } @@ -1529,7 +1551,9 @@ pub fn mirrored_sessions() { name: "Open new tab (second user)", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) + && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane remote_terminal.send_key(&TAB_MODE); std::thread::sleep(std::time::Duration::from_millis(100)); @@ -1544,7 +1568,6 @@ pub fn mirrored_sessions() { instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; if remote_terminal.cursor_position_is(3, 2) - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #2") && remote_terminal.status_bar_appears() { @@ -1559,7 +1582,7 @@ pub fn mirrored_sessions() { instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; if remote_terminal.cursor_position_is(3, 2) - && remote_terminal.tip_appears() + && remote_terminal.status_bar_appears() && remote_terminal.snapshot_contains("Tab #2") { // cursor is in the newly opened second pane @@ -1584,7 +1607,7 @@ pub fn mirrored_sessions() { }); second_runner.run_all_steps(); - if first_runner.test_timed_out || second_runner.test_timed_out { + if (first_runner.test_timed_out || second_runner.test_timed_out) && test_attempts >= 0 { test_attempts -= 1; continue; } @@ -1674,7 +1697,7 @@ pub fn multiple_users_in_same_pane_and_tab() { }); second_runner.run_all_steps(); - if first_runner.test_timed_out || second_runner.test_timed_out { + if (first_runner.test_timed_out || second_runner.test_timed_out) && test_attempts >= 0 { test_attempts -= 1; continue; } @@ -1767,7 +1790,7 @@ pub fn multiple_users_in_different_panes_and_same_tab() { }); second_runner.run_all_steps(); - if first_runner.test_timed_out || second_runner.test_timed_out { + if (first_runner.test_timed_out || second_runner.test_timed_out) && test_attempts >= 0 { test_attempts -= 1; continue; } @@ -1776,7 +1799,8 @@ pub fn multiple_users_in_different_panes_and_same_tab() { name: "take snapshot after", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane step_is_complete = true; } @@ -1790,6 +1814,7 @@ pub fn multiple_users_in_different_panes_and_same_tab() { let mut step_is_complete = false; if remote_terminal.cursor_position_is(3, 2) && remote_terminal.snapshot_contains("││$") + && remote_terminal.tab_bar_appears() { // cursor is back in the first tab step_is_complete = true; @@ -1847,7 +1872,9 @@ pub fn multiple_users_in_different_tabs() { name: "Open new tab", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(3, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(3, 2) + && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane remote_terminal.send_key(&TAB_MODE); std::thread::sleep(std::time::Duration::from_millis(100)); @@ -1859,7 +1886,7 @@ pub fn multiple_users_in_different_tabs() { }); second_runner.run_all_steps(); - if first_runner.test_timed_out || second_runner.test_timed_out { + if (first_runner.test_timed_out || second_runner.test_timed_out) && test_attempts >= 0 { test_attempts -= 1; continue; } @@ -1869,7 +1896,6 @@ pub fn multiple_users_in_different_tabs() { instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; if remote_terminal.cursor_position_is(3, 2) - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #1 [ ]") && remote_terminal.snapshot_contains("Tab #2") && remote_terminal.status_bar_appears() @@ -1887,7 +1913,6 @@ pub fn multiple_users_in_different_tabs() { instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; if remote_terminal.cursor_position_is(3, 2) - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #2 [ ]") && remote_terminal.status_bar_appears() { @@ -2006,9 +2031,7 @@ pub fn toggle_floating_panes() { name: "Wait for new pane to appear", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(33, 7) - && remote_terminal.snapshot_contains("FLOATING PANES VISIBLE") - { + if remote_terminal.cursor_position_is(33, 8) { // cursor is in the newly opened second pane step_is_complete = true; } @@ -2057,7 +2080,8 @@ pub fn tmux_mode() { name: "Wait for new pane to appear", instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { + if remote_terminal.cursor_position_is(63, 2) && remote_terminal.status_bar_appears() + { // cursor is in the newly opened second pane step_is_complete = true; } @@ -2163,7 +2187,7 @@ pub fn undo_rename_tab() { instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; if remote_terminal.snapshot_contains("Tab #1") - && remote_terminal.snapshot_contains("Tip:") + && remote_terminal.snapshot_contains("LOCK") { step_is_complete = true } @@ -2220,7 +2244,7 @@ pub fn undo_rename_pane() { instruction: |remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; if remote_terminal.snapshot_contains("Pane #1") - && remote_terminal.snapshot_contains("Tip:") + && remote_terminal.snapshot_contains("LOCK") { step_is_complete = true } diff --git a/src/tests/e2e/remote_runner.rs b/src/tests/e2e/remote_runner.rs index b3c61fa4..49cdf64e 100644 --- a/src/tests/e2e/remote_runner.rs +++ b/src/tests/e2e/remote_runner.rs @@ -351,10 +351,6 @@ impl RemoteTerminal { pub fn cursor_position_is(&self, x: usize, y: usize) -> bool { x == self.cursor_x && y == self.cursor_y } - pub fn tip_appears(&self) -> bool { - let snapshot = self.last_snapshot.lock().unwrap(); - snapshot.contains("Tip:") || snapshot.contains("QuickNav:") - } pub fn status_bar_appears(&self) -> bool { self.last_snapshot.lock().unwrap().contains("Ctrl +") } diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__bracketed_paste.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__bracketed_paste.snap index 55cb8d8a..77031624 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__bracketed_paste.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__bracketed_paste.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1676 +assertion_line: 1975 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__cannot_split_terminals_vertically_when_active_terminal_is_too_small.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__cannot_split_terminals_vertically_when_active_terminal_is_too_small.snap index 713fac4d..98b108ed 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__cannot_split_terminals_vertically_when_active_terminal_is_too_small.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__cannot_split_terminals_vertically_when_active_terminal_is_too_small.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 198 +assertion_line: 243 expression: last_snapshot --- Zellij @@ -20,6 +20,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────┘ - - + Ctrl + diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__close_pane.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__close_pane.snap index d7d6423f..8ad2ef36 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__close_pane.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__close_pane.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 557 +assertion_line: 707 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__detach_and_attach_session.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__detach_and_attach_session.snap index 7140fc40..705a746e 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__detach_and_attach_session.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__detach_and_attach_session.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 975 +assertion_line: 1138 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__focus_pane_with_mouse.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__focus_pane_with_mouse.snap index 2ca3fa89..173f8914 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__focus_pane_with_mouse.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__focus_pane_with_mouse.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1071 +assertion_line: 1352 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__lock_mode.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__lock_mode.snap index e6d38062..9fe1892d 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__lock_mode.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__lock_mode.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 836 +assertion_line: 985 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <> PANE <> TAB <> RESIZE <> MOVE <> SEARCH <> SESSION <> QUIT - -- INTERFACE LOCKED -- + Ctrl + <g> LOCK diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions-2.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions-2.snap index 9a9efdfc..2fac31b0 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions-2.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions-2.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1354 +assertion_line: 1625 expression: second_runner_snapshot --- Zellij (mirrored_sessions) Tab #1 Tab #2 @@ -24,6 +24,6 @@ expression: second_runner_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - <n> New / <←→> Move / <x> Close / <r> Rename / <s> Sync / <b> Break out / <[]> Break / <TAB> Toggle ... + Ctrl + <t> TAB n New ←→ Move x Close r Rename s Sync b Break out [] Break ... diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions.snap index 3546357c..9fb84667 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1340 +assertion_line: 1624 expression: first_runner_snapshot --- Zellij (mirrored_sessions) Tab #1 Tab #2 @@ -24,6 +24,6 @@ expression: first_runner_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left.snap index 2e3add78..c0d32cdd 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 531 +assertion_line: 558 expression: account_for_races_in_snapshot(last_snapshot) --- Zellij (e2e-test) Tab #1 Tab #3 Tab #2 @@ -24,6 +24,6 @@ expression: account_for_races_in_snapshot(last_snapshot) │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left_until_it_wraps_around.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left_until_it_wraps_around.snap index 9479e355..b7898ffb 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left_until_it_wraps_around.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_left_until_it_wraps_around.snap @@ -1,5 +1,6 @@ --- source: src/tests/e2e/cases.rs +assertion_line: 620 expression: account_for_races_in_snapshot(last_snapshot) --- Zellij (e2e-test) Tab #2 Tab #1 Tab #3 @@ -23,6 +24,6 @@ expression: account_for_races_in_snapshot(last_snapshot) │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right.snap index 2aee51c5..dfe09d2e 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 624 +assertion_line: 592 expression: account_for_races_in_snapshot(last_snapshot) --- Zellij (e2e-test) Tab #1 Tab #3 Tab #2 @@ -24,6 +24,6 @@ expression: account_for_races_in_snapshot(last_snapshot) │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right_until_it_wraps_around.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right_until_it_wraps_around.snap index 9c2303a5..0baedb2a 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right_until_it_wraps_around.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__move_tab_to_right_until_it_wraps_around.snap @@ -1,5 +1,6 @@ --- source: src/tests/e2e/cases.rs +assertion_line: 644 expression: account_for_races_in_snapshot(last_snapshot) --- Zellij (e2e-test) Tab #3 Tab #2 Tab #1 @@ -23,6 +24,6 @@ expression: account_for_races_in_snapshot(last_snapshot) │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab-2.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab-2.snap index 3c404b66..daf4e132 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab-2.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab-2.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1523 +assertion_line: 1809 expression: second_runner_snapshot --- Zellij (multiple_users_in_same_pane_and_tab) Tab #1 [ ] @@ -24,6 +24,6 @@ expression: second_runner_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab.snap index 189c1f76..ee6b7f0c 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_panes_and_same_tab.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1522 +assertion_line: 1808 expression: first_runner_snapshot --- Zellij (multiple_users_in_same_pane_and_tab) Tab #1 [ ] @@ -24,6 +24,6 @@ expression: first_runner_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs-2.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs-2.snap index 4cad75c0..dc5de24b 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs-2.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs-2.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1620 +assertion_line: 1907 expression: second_runner_snapshot --- Zellij (multiple_users_in_different_tabs) Tab #1 [ ] Tab #2 @@ -24,6 +24,6 @@ expression: second_runner_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs.snap index 389e4ce7..c6ef6230 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_different_tabs.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1619 +assertion_line: 1906 expression: first_runner_snapshot --- Zellij (multiple_users_in_different_tabs) Tab #1 Tab #2 [ ] @@ -24,6 +24,6 @@ expression: first_runner_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab-2.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab-2.snap index 4aaf8ead..3049701b 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab-2.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab-2.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1431 +assertion_line: 1716 expression: second_runner_snapshot --- Zellij (multiple_users_in_same_pane_and_tab) Tab #1 [ ] @@ -24,6 +24,6 @@ expression: second_runner_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab.snap index 7bd9cdd6..e3830eb6 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__multiple_users_in_same_pane_and_tab.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1430 +assertion_line: 1718 expression: first_runner_snapshot --- Zellij (multiple_users_in_same_pane_and_tab) Tab #1 [ ] @@ -24,6 +24,6 @@ expression: first_runner_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__open_new_tab.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__open_new_tab.snap index 279a9f48..93be29fc 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__open_new_tab.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__open_new_tab.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 416 +assertion_line: 452 expression: last_snapshot --- Zellij (e2e-test) Tab #1 Tab #2 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__quit_and_resurrect_session.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__quit_and_resurrect_session.snap index 5308c782..857f417d 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__quit_and_resurrect_session.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__quit_and_resurrect_session.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1171 +assertion_line: 1191 expression: last_snapshot --- Zellij (e2e-test) Tab #1 Tab #2 Tab #3 Tab #4 @@ -25,5 +25,5 @@ expression: last_snapshot │ └────────────────────────────────────────────────────────┘ │ │ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT BASE (FLOATING PANES VISIBLE): Press Ctrl p, <w> to hide. diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__quit_and_resurrect_session_with_viewport_serialization.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__quit_and_resurrect_session_with_viewport_serialization.snap index 8c0477f8..dff8858b 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__quit_and_resurrect_session_with_viewport_serialization.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__quit_and_resurrect_session_with_viewport_serialization.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1232 +assertion_line: 1252 expression: last_snapshot --- Zellij (e2e-test) Tab #1 Tab #2 Tab #3 Tab #4 @@ -25,5 +25,5 @@ expression: last_snapshot │ └────────────────────────────────────────────────────────┘ │ │ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT BASE (FLOATING PANES VISIBLE): Press Ctrl p, <w> to hide. diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_pane.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_pane.snap index 76421628..79b5028a 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_pane.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_pane.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 765 +assertion_line: 923 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └────────────────────────────────────────────────────┘└────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_terminal_window.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_terminal_window.snap index ef696f27..da8650ae 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_terminal_window.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__resize_terminal_window.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 889 +assertion_line: 1050 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └────────────────────────────────────────────────┘└────────────────────────────────────────────────┘ - Ctrl + g p t n h s o q Alt + <[]> - QuickNav: Alt + <n> / Alt + <←↓↑→> or Alt + <hjkl> / Alt + <+|-> + Ctrl + g p t n h s o q Alt + <n> New Pane <←↓↑→> Change Focus diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane.snap index e1d36e7c..33f36714 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane.snap @@ -1,11 +1,12 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 305 +assertion_line: 323 expression: last_snapshot --- Zellij (e2e-test) Tab #1 -┌ Pane #1 ─────────────────────────────────────────────────┐┌ Pane #2 ─────────────────────────────────── SCROLL: 1/4 ┐ -│$ ││line3 │ +┌ Pane #1 ─────────────────────────────────────────────────┐┌ Pane #2 ─────────────────────────────────── SCROLL: 1/3 ┐ +│$ ││line2 │ +│ ││line3 │ │ ││line4 │ │ ││line5 │ │ ││line6 │ @@ -25,5 +26,4 @@ expression: last_snapshot │ ││line20 │ │ ││li█e21 │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - <s> Search / <↓↑> Scroll / <PgDn|PgUp> Scroll / <d|u> Scroll / <e> Edit / <ENTER> Select + Ctrl + <s> SEARCH s Search ↓↑ Scroll PgDn|PgUp Scroll d|u Scroll e Edit ENTER Select diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane_with_mouse.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane_with_mouse.snap index dfbbc98f..a8ec256e 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane_with_mouse.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__scrolling_inside_a_pane_with_mouse.snap @@ -1,11 +1,12 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1147 +assertion_line: 1428 expression: last_snapshot --- Zellij (e2e-test) Tab #1 -┌ Pane #1 ─────────────────────────────────────────────────┐┌ Pane #2 ─────────────────────────────────── SCROLL: 3/4 ┐ -│$ ││line1 │ +┌ Pane #1 ─────────────────────────────────────────────────┐┌ Pane #2 ─────────────────────────────────── SCROLL: 3/3 ┐ +│$ ││$ cat /usr/src/zellij/fixtures/e2e/scrolling_inside_a_pane│ +│ ││line1 │ │ ││line2 │ │ ││line3 │ │ ││line4 │ @@ -25,5 +26,4 @@ expression: last_snapshot │ ││line18 │ │ ││li█e19 │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__send_command_through_the_cli.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__send_command_through_the_cli.snap index 4d255521..197fd571 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__send_command_through_the_cli.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__send_command_through_the_cli.snap @@ -1,9 +1,9 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 2175 +assertion_line: 2349 expression: last_snapshot --- - Zellij (e2e-test) Tab #1 + Zellij (e2e-test) Tab #1 Alt <[]> VERTICAL ┌ Pane #1 ────────────────────────────────────────────────────────────────┐┌ /usr/src/zellij/fixtures/append-echo-script.sh ─────────────────────────┐ │$ /usr/src/zellij/x86_64-unknown-linux-musl/release/zellij run -s -- "/us││foo │ │r/src/zellij/fixtures/append-echo-script.sh" ││foo │ @@ -24,6 +24,6 @@ expression: last_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └─────────────────────────────────────────────────────────────────────────┘└ [ EXIT CODE: 0 ] <ENTER> re-run, <ESC> drop to shell, <Ctrl-c> exit ────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT Alt + <[]> VERTICAL - Tip: Alt + <n> => open new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate between panes. Alt + <+|-> => increase/decrease pane size. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT Alt + <n> New <←↓↑→> Focus diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__split_terminals_vertically.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__split_terminals_vertically.snap index 39f7de54..1ca3ee0a 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__split_terminals_vertically.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__split_terminals_vertically.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 168 +assertion_line: 194 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__start_without_pane_frames.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__start_without_pane_frames.snap index b8fdc86d..2d048e02 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__start_without_pane_frames.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__start_without_pane_frames.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1326 +assertion_line: 1476 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -25,5 +25,5 @@ $ │ │ │ │ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + │ + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__starts_with_one_terminal.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__starts_with_one_terminal.snap index b76d31ec..a78c91c2 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__starts_with_one_terminal.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__starts_with_one_terminal.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 120 +assertion_line: 145 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__status_bar_loads_custom_keybindings.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__status_bar_loads_custom_keybindings.snap index a0fe5fbd..93be704b 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__status_bar_loads_custom_keybindings.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__status_bar_loads_custom_keybindings.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1266 +assertion_line: 1293 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - <F1> LOCK <F2> PANE <F3> TAB <F4> RESIZE <F5> MOVE <F6> SEARCH <Alt F7> SESSION <Ctrl F8> QUIT - Tip: UNBOUND => open new pane. UNBOUND => navigate between panes. UNBOUND => increase/decrease pane size. + F1 LOCK F2 PANE F3 TAB F4 RESIZE F5 MOVE F6 SEARCH Alt F7 SESSION Ctrl F8 QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__tmux_mode.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__tmux_mode.snap index d3e715c7..dc180a12 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__tmux_mode.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__tmux_mode.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1772 +assertion_line: 2070 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ ││ │ │ ││ │ │ ││ │ +│ ││ │ └──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_floating_panes.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_floating_panes.snap index 3007e299..d5231a04 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_floating_panes.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_floating_panes.snap @@ -1,14 +1,15 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1984 +assertion_line: 2027 expression: last_snapshot --- - Zellij (e2e-test) Tab #1 + Zellij (e2e-test) Tab #1 Alt <[]> STAGGERED ┌ Pane #1 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ │$ │ │ │ │ │ │ │ +│ │ │ ┌ Pane #2 ─────────────────────────────────────────────────┐ │ │ │$ █ │ │ │ │ │ │ @@ -18,12 +19,11 @@ expression: last_snapshot │ │ │ │ │ │ │ │ │ │ │ │ +│ │ │ │ │ └──────────────────────────────────────────────────────────┘ │ │ │ │ │ │ │ │ │ -│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - (FLOATING PANES VISIBLE): Press Ctrl p, <w> to hide. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_pane_fullscreen.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_pane_fullscreen.snap index 94d026ae..a81f9814 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_pane_fullscreen.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__toggle_pane_fullscreen.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 351 +assertion_line: 386 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - (FULLSCREEN): + 1 hidden panes + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__typing_exit_closes_pane.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__typing_exit_closes_pane.snap index 2907e211..33ffd4b5 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__typing_exit_closes_pane.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__typing_exit_closes_pane.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 702 +assertion_line: 858 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_pane.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_pane.snap index ca77b6b9..859a9763 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_pane.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_pane.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1921 +assertion_line: 2240 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_tab.snap b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_tab.snap index 453521e5..7fa61630 100644 --- a/src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_tab.snap +++ b/src/tests/e2e/snapshots/zellij__tests__e2e__cases__undo_rename_tab.snap @@ -1,6 +1,6 @@ --- source: src/tests/e2e/cases.rs -assertion_line: 1871 +assertion_line: 2183 expression: last_snapshot --- Zellij (e2e-test) Tab #1 @@ -24,6 +24,6 @@ expression: last_snapshot │ │ │ │ │ │ +│ │ └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT - Tip: Alt + <n> => new pane. Alt + <←↓↑→> or Alt + <hjkl> => navigate. Alt + <+|-> => resize pane. + Ctrl + <g> LOCK <p> PANE <t> TAB <n> RESIZE <h> MOVE <s> SEARCH <o> SESSION <q> QUIT diff --git a/src/tests/e2e/steps.rs b/src/tests/e2e/steps.rs index 85009e19..91cc0e5b 100644 --- a/src/tests/e2e/steps.rs +++ b/src/tests/e2e/steps.rs @@ -9,7 +9,7 @@ pub fn new_tab() -> Step { name: "Open new tab", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.tip_appears() && remote_terminal.status_bar_appears() { + if remote_terminal.status_bar_appears() { remote_terminal.send_key(&TAB_MODE); std::thread::sleep(std::time::Duration::from_millis(100)); remote_terminal.send_key(&NEW_TAB_IN_TAB_MODE); @@ -24,9 +24,7 @@ pub fn check_second_tab_opened() -> Step { Step { name: "Check second tab opened", instruction: |remote_terminal: RemoteTerminal| -> bool { - remote_terminal.status_bar_appears() - && remote_terminal.tip_appears() - && remote_terminal.snapshot_contains("Tab #2") + remote_terminal.status_bar_appears() && remote_terminal.snapshot_contains("Tab #2") }, } } @@ -36,7 +34,7 @@ pub fn move_tab_left() -> Step { name: "Move tab left", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.tip_appears() && remote_terminal.status_bar_appears() { + if remote_terminal.status_bar_appears() { remote_terminal.send_key(&MOVE_TAB_LEFT); std::thread::sleep(std::time::Duration::from_millis(100)); step_is_complete = true; @@ -51,7 +49,6 @@ pub fn check_third_tab_moved_left() -> Step { name: "Check third tab is in the middle", instruction: |remote_terminal: RemoteTerminal| -> bool { remote_terminal.status_bar_appears() - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #1 Tab #3 Tab #2") }, } @@ -62,7 +59,7 @@ pub fn type_second_tab_content() -> Step { name: "Type second tab content", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.tip_appears() && remote_terminal.status_bar_appears() { + if remote_terminal.status_bar_appears() { remote_terminal.send_key(&SECOND_TAB_CONTENT); step_is_complete = true; } @@ -75,9 +72,7 @@ pub fn check_third_tab_opened() -> Step { Step { name: "Check third tab opened", instruction: |remote_terminal: RemoteTerminal| -> bool { - remote_terminal.status_bar_appears() - && remote_terminal.tip_appears() - && remote_terminal.snapshot_contains("Tab #3") + remote_terminal.status_bar_appears() && remote_terminal.snapshot_contains("Tab #3") }, } } @@ -87,7 +82,7 @@ pub fn switch_focus_to_left_tab() -> Step { name: "Move focus to tab on the left", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.tip_appears() && remote_terminal.status_bar_appears() { + if remote_terminal.status_bar_appears() { remote_terminal.send_key(&MOVE_FOCUS_LEFT_IN_NORMAL_MODE); step_is_complete = true; } @@ -101,7 +96,6 @@ pub fn check_focus_on_second_tab() -> Step { name: "Check focus is on the second tab", instruction: |remote_terminal: RemoteTerminal| -> bool { remote_terminal.status_bar_appears() - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #2 content") }, } @@ -112,7 +106,7 @@ pub fn move_tab_right() -> Step { name: "Move tab right", instruction: |mut remote_terminal: RemoteTerminal| -> bool { let mut step_is_complete = false; - if remote_terminal.tip_appears() && remote_terminal.status_bar_appears() { + if remote_terminal.status_bar_appears() { remote_terminal.send_key(&MOVE_TAB_RIGHT); step_is_complete = true; } @@ -126,7 +120,6 @@ pub fn check_third_tab_moved_to_beginning() -> Step { name: "Check third tab moved to beginning", instruction: |remote_terminal: RemoteTerminal| -> bool { remote_terminal.status_bar_appears() - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #3 Tab #1 Tab #2") }, } @@ -137,7 +130,6 @@ pub fn check_third_tab_is_left_wrapped() -> Step { name: "Check third tab is in last position", instruction: |remote_terminal: RemoteTerminal| -> bool { remote_terminal.status_bar_appears() - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #2 Tab #1 Tab #3") }, } @@ -148,7 +140,6 @@ pub fn check_third_tab_is_right_wrapped() -> Step { name: "Check third tab is in last position", instruction: |remote_terminal: RemoteTerminal| -> bool { remote_terminal.status_bar_appears() - && remote_terminal.tip_appears() && remote_terminal.snapshot_contains("Tab #3 Tab #2 Tab #1") }, } |