diff options
Diffstat (limited to 'zellij-server/src/tab/unit/tab_integration_tests.rs')
| -rw-r--r-- | zellij-server/src/tab/unit/tab_integration_tests.rs | 106 |
1 files changed, 23 insertions, 83 deletions
diff --git a/zellij-server/src/tab/unit/tab_integration_tests.rs b/zellij-server/src/tab/unit/tab_integration_tests.rs index ef5cc1bf0..f8953235e 100644 --- a/zellij-server/src/tab/unit/tab_integration_tests.rs +++ b/zellij-server/src/tab/unit/tab_integration_tests.rs @@ -20,8 +20,8 @@ use zellij_utils::data::ResizeStrategy; use zellij_utils::envs::set_session_name; use zellij_utils::errors::{prelude::*, ErrorContext}; use zellij_utils::input::layout::{ - FloatingPaneLayout, Layout, PluginUserConfiguration, RunPluginLocation, SwapFloatingLayout, - SwapTiledLayout, TiledPaneLayout, + FloatingPaneLayout, Layout, PluginUserConfiguration, RunPluginLocation, RunPluginOrAlias, + SwapFloatingLayout, SwapTiledLayout, TiledPaneLayout, }; use zellij_utils::input::plugins::PluginTag; use zellij_utils::ipc::IpcReceiverWithContext; @@ -273,7 +273,7 @@ fn create_new_tab_with_swap_layouts( Vec<FloatingPaneLayout>, Vec<(u32, Option<RunCommand>)>, Vec<(u32, Option<RunCommand>)>, - HashMap<(RunPluginLocation, PluginUserConfiguration), Vec<u32>>, + HashMap<RunPluginOrAlias, Vec<u32>>, )>, draw_pane_frames: bool, ) -> Tab { @@ -5022,17 +5022,11 @@ fn layout_with_plugins_and_commands_swaped_properly() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5123,17 +5117,11 @@ fn base_layout_is_included_in_swap_layouts() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5221,17 +5209,11 @@ fn swap_layouts_including_command_panes_absent_from_existing_layout() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5322,17 +5304,11 @@ fn swap_layouts_not_including_command_panes_present_in_existing_layout() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5496,17 +5472,11 @@ fn swap_layouts_not_including_plugin_panes_present_in_existing_layout() { let new_floating_terminal_ids = vec![]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -5987,17 +5957,11 @@ fn floating_layout_with_plugins_and_commands_swaped_properly() { let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -6086,17 +6050,11 @@ fn base_floating_layout_is_included_in_swap_layouts() { let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -6184,17 +6142,11 @@ fn swap_floating_layouts_including_command_panes_absent_from_existing_layout() { let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -6285,17 +6237,11 @@ fn swap_floating_layouts_not_including_command_panes_present_in_existing_layout( let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); @@ -6448,17 +6394,11 @@ fn swap_floating_layouts_not_including_plugin_panes_present_in_existing_layout() let new_terminal_ids = vec![(4, None)]; let mut new_plugin_ids = HashMap::new(); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("tab-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:tab-bar", &None, None, None).unwrap(), vec![1], ); new_plugin_ids.insert( - ( - RunPluginLocation::Zellij(PluginTag::new("status-bar")), - Default::default(), - ), + RunPluginOrAlias::from_url("zellij:status-bar", &None, None, None).unwrap(), vec![2], ); |