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

refactor(tabs): lay down infrastructure for multiple users #864

Merged
merged 22 commits into from
Nov 12, 2021
Merged

refactor(tabs): lay down infrastructure for multiple users #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9131d63
refactor(screen): support multiple mirrored clients
imsnif Oct 14, 2021
d72f99c
style(fmt): make rustfmt happy
imsnif Oct 14, 2021
16afa27
style(clippy): make clippy happy
imsnif Oct 14, 2021
9724a41
whitespace
imsnif Oct 14, 2021
fbbcd63
github, y u no update CI?!
imsnif Oct 14, 2021
f83f97c
is this a cache issue?
imsnif Oct 15, 2021
634f262
is it the checkout cache?
imsnif Oct 15, 2021
646bdb2
no cache at all?
imsnif Oct 15, 2021
738f80f
Debug
imsnif Oct 15, 2021
1e810e5
fix gototab
imsnif Oct 15, 2021
3881646
Merge branch 'main' into multiple-users-screen-structs
imsnif Oct 15, 2021
e3c7aab
Merge branch 'multiple-users-screen-structs-please-github' of https:/…
imsnif Oct 15, 2021
5ae0129
decoment
imsnif Oct 15, 2021
856c136
Merge branch 'multiple-users-screen-structs' of https://github.com/mo…
imsnif Oct 15, 2021
ec49aab
gototab none in wasm_vm
imsnif Oct 15, 2021
7992433
gototab none in wasm_vm
imsnif Oct 15, 2021
765e3b7
the fun never ends
imsnif Oct 15, 2021
5ef5611
tests(e2e): update infra and add multiple user mirroring test
imsnif Nov 11, 2021
c4cfd76
refactor(tab): change structs in tabs and terminal panes to support m…
imsnif Nov 11, 2021
8bc9318
Merge branch 'main' into multiple-users-tab-pane-structs
imsnif Nov 12, 2021
8684bd4
style(fmt): make rustfmt happy
imsnif Nov 12, 2021
5d58dcf
style(fmt): make clippy happy
imsnif Nov 12, 2021
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
1,458 changes: 935 additions & 523 deletions src/tests/e2e/cases.rs
View file
Open in desktop

Large diffs are not rendered by default.

412 changes: 217 additions & 195 deletions src/tests/e2e/remote_runner.rs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...sts__e2e__cases__cannot_split_terminals_vertically_when_active_terminal_is_too_small.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ expression: last_snapshot
│ │
└──────┘
Ctrl +
...
50 changes: 25 additions & 25 deletions 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
@@ -1,29 +1,29 @@
---
source: src/tests/integration/e2e.rs
source: src/tests/e2e/cases.rs
expression: last_snapshot

---
Zellij  Tab #1 
$ │$ █
│
│
│
│
│
│
│
│
│
│
│
│
│
│
│
│
│
│
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <r> RESIZE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + n => open new pane. Alt + [] or hjkl => navigate between panes.
Zellij (e2e-test)  Tab #1 
┌ Pane #1 ─────────────────────────────────────────────────┐┌ Pane #2 ─────────────────────────────────────────────────┐
│$ █ ││$ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘
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
29 changes: 29 additions & 0 deletions src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
source: src/tests/e2e/cases.rs
expression: second_runner_snapshot

---
Zellij (mirrored_sessions)  Tab #1  Tab #2 
┌ Pane #1 ─────────────────────────────────────────────────┐┌ Pane #2 ─────────────────────────────────────────────────┐
│$ █ ││$ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
│ ││ │
└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘
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
8 changes: 4 additions & 4 deletions src/tests/e2e/snapshots/zellij__tests__e2e__cases__mirrored_sessions.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
source: src/tests/e2e/cases.rs
expression: last_snapshot
expression: first_runner_snapshot

---
Zellij (mirrored_sessions)  Tab #1 
Zellij (mirrored_sessions)  Tab #1  Tab #2 
┌ Pane #1 ─────────────────────────────────────────────────┐┌ Pane #2 ─────────────────────────────────────────────────┐
│$ ││$ █ │
│$ █ ││$ │
│ ││ │
│ ││ │
│ ││ │
Expand All @@ -26,4 +26,4 @@ expression: last_snapshot
│ ││ │
└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <h> MOVE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + <n> => new pane. Alt + <[] or hjkl> => navigate. Alt + <+-> => resize pane.
<←↓↑→> Move focus / <n> New / <x> Close / <r> Rename / <s> Sync / <Tab> Toggle / <ENTER> Select pane
29 changes: 29 additions & 0 deletions src/tests/e2e/snapshots/zellij__tests__e2e__cases__typing_exit_closes_pane.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
source: src/tests/e2e/cases.rs
expression: last_snapshot

---
Zellij (e2e-test)  Tab #1 
┌ Pane #1 ─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
│$ █ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
Ctrl + <g> LOCK  <p> PANE  <t> TAB  <n> RESIZE  <h> MOVE  <s> SCROLL  <o> SESSION  <q> QUIT 
Tip: Alt + <n> => new pane. Alt + <[] or hjkl> => navigate. Alt + <+-> => resize pane.
Loading