Skip to content

Commit

Permalink
Merge pull request #576 from a-kenji/layout-error
Browse files Browse the repository at this point in the history 
Move `layout.rs` from `server` to `utils`
  • Loading branch information
@a-kenji
a-kenji authored Jun 15, 2021
2 parents 7f67e6d + 4743b7e commit 64d639b
Show file tree
Hide file tree
Showing 27 changed files with 283 additions and 107 deletions.
9 changes: 9 additions & 0 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use zellij_utils::{
cli::{CliArgs, Command, Sessions},
consts::{ZELLIJ_TMP_DIR, ZELLIJ_TMP_LOG_DIR},
input::config::Config,
input::layout::Layout,
input::options::Options,
logging::*,
setup::{get_default_data_dir, Setup},
Expand Down Expand Up @@ -72,6 +73,7 @@ pub fn main() {
opts,
config,
ClientInfo::Attach(session_name.unwrap(), force, config_options),
None,
);
} else {
let session_name = opts
Expand All @@ -85,11 +87,18 @@ pub fn main() {
#[cfg(not(disable_automatic_asset_installation))]
populate_data_dir(&data_dir);

let layout = Layout::from_path_or_default(
opts.layout.as_ref(),
opts.layout_path.as_ref(),
&data_dir,
);

start_client(
Box::new(os_input),
opts,
config,
ClientInfo::New(session_name),
layout,
);
}
}
Expand Down
Binary file modified src/tests/fixtures/htop
View file
Binary file not shown.
14 changes: 14 additions & 0 deletions src/tests/integration/basic.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ pub fn starts_with_one_terminal() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -61,6 +62,7 @@ pub fn split_terminals_vertically() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -89,6 +91,7 @@ pub fn split_terminals_horizontally() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -124,6 +127,7 @@ pub fn split_largest_terminal() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -152,6 +156,7 @@ pub fn cannot_split_terminals_vertically_when_active_terminal_is_too_small() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -180,6 +185,7 @@ pub fn cannot_split_terminals_horizontally_when_active_terminal_is_too_small() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -208,6 +214,7 @@ pub fn cannot_split_largest_terminal_when_there_is_no_room() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -244,6 +251,7 @@ pub fn scrolling_up_inside_a_pane() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -282,6 +290,7 @@ pub fn scrolling_down_inside_a_pane() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -317,6 +326,7 @@ pub fn scrolling_page_up_inside_a_pane() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -355,6 +365,7 @@ pub fn scrolling_page_down_inside_a_pane() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -394,6 +405,7 @@ pub fn max_panes() {
opts,
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -431,6 +443,7 @@ pub fn toggle_focused_pane_fullscreen() {
opts,
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down Expand Up @@ -471,6 +484,7 @@ pub fn bracketed_paste() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);
let output_frames = fake_input_output
.stdout_writer
Expand Down
13 changes: 13 additions & 0 deletions src/tests/integration/close_pane.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ pub fn close_pane_with_another_pane_above_it() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -89,6 +90,7 @@ pub fn close_pane_with_another_pane_below_it() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -129,6 +131,7 @@ pub fn close_pane_with_another_pane_to_the_left() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -170,6 +173,7 @@ pub fn close_pane_with_another_pane_to_the_right() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -216,6 +220,7 @@ pub fn close_pane_with_multiple_panes_above_it() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -260,6 +265,7 @@ pub fn close_pane_with_multiple_panes_below_it() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -306,6 +312,7 @@ pub fn close_pane_with_multiple_panes_to_the_left() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -350,6 +357,7 @@ pub fn close_pane_with_multiple_panes_to_the_right() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -417,6 +425,7 @@ pub fn close_pane_with_multiple_panes_above_it_away_from_screen_edges() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -480,6 +489,7 @@ pub fn close_pane_with_multiple_panes_below_it_away_from_screen_edges() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -545,6 +555,7 @@ pub fn close_pane_with_multiple_panes_to_the_left_away_from_screen_edges() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -610,6 +621,7 @@ pub fn close_pane_with_multiple_panes_to_the_right_away_from_screen_edges() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down Expand Up @@ -647,6 +659,7 @@ pub fn closing_last_pane_exits_app() {
CliArgs::default(),
Box::new(fake_input_output.clone()),
Config::default(),
None,
);

let output_frames = fake_input_output
Expand Down
Loading

0 comments on commit 64d639b

Please sign in to comment.