Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(keybinds): improve default keybindings #991

Merged
merged 1 commit into from
Jan 4, 2022
Merged

feat(keybinds): improve default keybindings #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 1 addition & 43 deletions src/tests/e2e/cases.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ pub fn split_terminals_vertically() {
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -164,7 +163,6 @@ pub fn cannot_split_terminals_vertically_when_active_terminal_is_too_small() {
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -213,8 +211,6 @@ pub fn scrolling_inside_a_pane() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -312,8 +308,6 @@ pub fn toggle_pane_fullscreen() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand All @@ -327,8 +321,6 @@ pub fn toggle_pane_fullscreen() {
// cursor is in the newly opened second pane
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&TOGGLE_ACTIVE_TERMINAL_FULLSCREEN_IN_PANE_MODE);
// back to normal mode after toggling fullscreen
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -376,8 +368,6 @@ pub fn open_new_tab() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand All @@ -391,8 +381,6 @@ pub fn open_new_tab() {
// cursor is in the newly opened second pane
remote_terminal.send_key(&TAB_MODE);
remote_terminal.send_key(&NEW_TAB_IN_TAB_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -444,8 +432,6 @@ pub fn close_tab() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand All @@ -459,8 +445,6 @@ pub fn close_tab() {
// cursor is in the newly opened second pane
remote_terminal.send_key(&TAB_MODE);
remote_terminal.send_key(&NEW_TAB_IN_TAB_MODE);
// back to normal mode
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -527,8 +511,6 @@ pub fn close_pane() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand All @@ -542,8 +524,6 @@ pub fn close_pane() {
// cursor is in the newly opened second pane
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&CLOSE_PANE_IN_PANE_MODE);
// back to normal mode after close
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -672,8 +652,6 @@ pub fn typing_exit_closes_pane() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -737,8 +715,6 @@ pub fn resize_pane() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand All @@ -752,7 +728,7 @@ pub fn resize_pane() {
// cursor is in the newly opened second pane
remote_terminal.send_key(&RESIZE_MODE);
remote_terminal.send_key(&RESIZE_LEFT_IN_RESIZE_MODE);
// back to normal mode after resizing
// back to normal mode
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
Expand Down Expand Up @@ -861,8 +837,6 @@ pub fn resize_terminal_window() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -922,8 +896,6 @@ pub fn detach_and_attach_session() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -1044,8 +1016,6 @@ fn focus_pane_with_mouse() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -1105,8 +1075,6 @@ pub fn scrolling_inside_a_pane_with_mouse() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -1198,8 +1166,6 @@ pub fn start_without_pane_frames() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -1268,8 +1234,6 @@ pub fn mirrored_sessions() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand All @@ -1283,8 +1247,6 @@ pub fn mirrored_sessions() {
// cursor is in the newly opened second pane
remote_terminal.send_key(&TAB_MODE);
remote_terminal.send_key(&NEW_TAB_IN_TAB_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -1505,8 +1467,6 @@ pub fn multiple_users_in_different_panes_and_same_tab() {
{
remote_terminal.send_key(&PANE_MODE);
remote_terminal.send_key(&SPLIT_RIGHT_IN_PANE_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down Expand Up @@ -1596,8 +1556,6 @@ pub fn multiple_users_in_different_tabs() {
// cursor is in the newly opened second pane
remote_terminal.send_key(&TAB_MODE);
remote_terminal.send_key(&NEW_TAB_IN_TAB_MODE);
// back to normal mode after split
remote_terminal.send_key(&ENTER);
step_is_complete = true;
}
step_is_complete
Expand Down
2 changes: 1 addition & 1 deletion src/tests/e2e/snapshots/zellij__tests__e2e__cases__close_tab.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ expression: last_snapshot
│ ││ │
└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <h> MOVE  <s> SCROLL  <o> SESSION  <q> QUIT 
<←↓↑→> Move focus / <n> New / <x> Close / <r> Rename / <s> Sync / <Tab> Toggle / <ENTER> Select pane
Tip: Alt + <n> => new pane. Alt + <[] or hjkl> => navigate. Alt + <+-> => resize pane.
Loading