public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though

Browse Source
This commit is contained in:
Ryan Ward
2026-05-07 11:29:34 -05:00
parent f4e2475c60
commit a41cbd8cc7
2433 changed files with 14208 additions and 9409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/integration/src/bin/integration.rs
+5 -5
View File
@@ -4,9 +4,9 @@ use anyhow::Result;
use clap::Parser;
use integration::test::*;
use integration::Builder;
use warp_cli::WorkerCommand;
use warp_core::channel::{Channel, ChannelConfig, ChannelState, OzConfig, WarpServerConfig};
use warp_core::AppId;
use galaxy_cli::WorkerCommand;
use galaxy_core::channel::{Channel, ChannelConfig, ChannelState, OzConfig, WarpServerConfig};
use galaxy_core::AppId;
/// The Warp integration test runner.
#[derive(Debug, Default, Parser, Clone)]
@@ -67,7 +67,7 @@ pub fn main() -> Result<()> {
// GUI application), do so. This must occur before init_logging, as the
// terminal server sets up its own logger, and attempting to set a second
// logger leads to a panic.
warp::terminal::local_tty::server::run_terminal_server(args);
galaxy::terminal::local_tty::server::run_terminal_server(args);
return Ok(());
}
// This is a catch-all to handle the plugin host, which the integration test crate doesn't have a feature flag for.
@@ -105,7 +105,7 @@ pub fn main() -> Result<()> {
}
#[cfg_attr(not(unix), allow(unreachable_code))]
warp::run_integration_test(driver)
galaxy::run_integration_test(driver)
}
/// Type of a function that produces an integration test builder.
crates/integration/src/builder.rs
+7 -7
View File
@@ -4,11 +4,11 @@ use std::future::Future;
use std::path::PathBuf;
use std::pin::Pin;
use std::time::Duration;
use warpui::integration::{self, PersistedDataMap, TestStep};
use warpui::integration::{TestDriver, TestSetupUtils};
use warpui::{App, WindowId};
use warpui_extras::user_preferences::file_backed::FileBackedUserPreferences;
use warpui_extras::user_preferences::UserPreferences;
use galaxyui::integration::{self, PersistedDataMap, TestStep};
use galaxyui::integration::{TestDriver, TestSetupUtils};
use galaxyui::{App, WindowId};
use galaxyui_extras::user_preferences::file_backed::FileBackedUserPreferences;
use galaxyui_extras::user_preferences::UserPreferences;
// We have logic in our build script to pass the path of the cargo target
// tmp directory to our app. This needs to be done as a build script because
@@ -179,7 +179,7 @@ impl Builder {
// Set the DISABLE_SAVE_ENV_VAR to make sure we don't write any keybinding changes to the
// filesystem
utils.set_env(warp::keyboard::DISABLE_SAVE_ENV_VAR, Some("true"));
utils.set_env(galaxy::keyboard::DISABLE_SAVE_ENV_VAR, Some("true"));
// On Ubuntu (and possibly other Linux distros), a message is
// printed out during shell initialization telling the user how to
@@ -199,7 +199,7 @@ impl Builder {
// As part of initializing the test driver, $HOME gets set to a unique
// temporary directory. We can now construct a file containing any
// initial user preferences that are needed for the test.
let file_path = warp::settings::user_preferences_file_path();
let file_path = galaxy::settings::user_preferences_file_path();
// Use println because logging may not have been initialized yet.
println!("Initializing preferences file at {file_path:?}");
let prefs = match FileBackedUserPreferences::new(file_path.clone()) {
crates/integration/src/lib.rs
+2 -2
View File
@@ -6,5 +6,5 @@ pub mod user_defaults;
pub mod util;
pub use builder::Builder;
pub use warp::integration_testing::view_getters;
pub use warpui::integration::TestStep;
pub use galaxy::integration_testing::view_getters;
pub use galaxyui::integration::TestStep;
crates/integration/src/test.rs
+29 -29
View File
@@ -75,7 +75,7 @@ use pathfinder_geometry::{rect::RectF, vector::Vector2F};
use rust_embed::RustEmbed;
use settings::Setting as _;
use shell::ShellType;
use warpui::{
use galaxyui::{
async_assert, async_assert_eq,
integration::{AssertionOutcome, StepData, TestStep},
keymap::{Keystroke, Trigger},
@@ -84,11 +84,11 @@ use warpui::{
AssetProvider, Event, SingletonEntity, UpdateView, ViewHandle,
};
use warp::{terminal::find::TerminalFindModel, util::bindings::CustomAction, AgentModeEntrypoint};
use galaxy::{terminal::find::TerminalFindModel, util::bindings::CustomAction, AgentModeEntrypoint};
use sysinfo::{Pid, ProcessesToUpdate, System};
use version_compare::Cmp;
use warpui::units::Lines;
use galaxyui::units::Lines;
use crate::util::{skip_if_powershell_core_2303, ShellRcType};
@@ -96,19 +96,19 @@ use crate::builder::cargo_target_tmpdir;
use crate::user_defaults;
use crate::Builder;
use sum_tree::SeekBias;
use warp::integration_testing::terminal::assert_focused_editor_in_tab;
use warp::integration_testing::{
use galaxy::integration_testing::terminal::assert_focused_editor_in_tab;
use galaxy::integration_testing::{
settings::assert_theme_chooser_contains,
tab::{assert_pane_title, assert_tab_title},
};
use warp::settings::CtrlTabBehavior;
use warp::terminal::keys_settings::KeysSettings;
use warp::terminal::{
use galaxy::settings::CtrlTabBehavior;
use galaxy::terminal::keys_settings::KeysSettings;
use galaxy::terminal::{
model::{blocks::BlockHeightSummary, terminal_model::BlockIndex},
view::TerminalViewState,
};
use warp::workflows::categories::CategoriesView;
use warp::{
use galaxy::workflows::categories::CategoriesView;
use galaxy::{
appearance::Appearance,
cmd_or_ctrl_shift,
integration_testing::{
@@ -168,8 +168,8 @@ use warp::{
},
};
use warp::terminal::view::ALIAS_EXPANSION_BANNER_SEEN_KEY;
use warp::{
use galaxy::terminal::view::ALIAS_EXPANSION_BANNER_SEEN_KEY;
use galaxy::{
features::FeatureFlag,
integration_testing::{
find::{Find, FindWithinBlockState},
@@ -180,13 +180,13 @@ use warp::{
window::add_and_save_window,
},
};
use warp::{
use galaxy::{
integration_testing::warp_drive::{
assert_is_left_panel_open, assert_warp_drive_is_closed, assert_warp_drive_is_open,
},
settings::CompletionsOpenWhileTyping,
};
use warp::{
use galaxy::{
integration_testing::{
self,
input::{input_contains_string, input_is_empty},
@@ -196,11 +196,11 @@ use warp::{
},
settings::MonospaceFontSize,
};
use warp::{
use galaxy::{
integration_testing::{assertions::join_a_workspace, view_getters::single_terminal_view},
terminal::view::TerminalAction,
};
use warp::{
use galaxy::{
integration_testing::{
command_palette::{
close_command_palette, open_command_palette, open_command_palette_and_run_action,
@@ -210,11 +210,11 @@ use warp::{
},
pane_group::AGENT_MODE_PANE_DEFAULT_MINIMUM_WIDTH,
};
use warp::{
use galaxy::{
integration_testing::{terminal::util::ExactLine, workspace::assert_tab_count},
terminal::available_shells::AvailableShells,
};
use warp::{
use galaxy::{
integration_testing::{
terminal::{
assert_active_block_output, assert_alt_grid_active, assert_alt_screen_output,
@@ -225,8 +225,8 @@ use warp::{
},
workspace::WorkspaceAction,
};
use warp::{settings_view::SettingsAction, terminal::block_list_viewport::ScrollLines};
use warp::{
use galaxy::{settings_view::SettingsAction, terminal::block_list_viewport::ScrollLines};
use galaxy::{
settings_view::{keybindings::KeybindingsView, SettingsSection, SettingsView},
terminal::{
input::{Input, InputSuggestionsMode},
@@ -239,9 +239,9 @@ use warp::{
},
workspace::{Workspace, NEW_SESSION_MENU_BUTTON_POSITION_ID, NEW_TAB_BUTTON_POSITION_ID},
};
use warpui::event::KeyState;
use warpui::keymap::PerPlatformKeystroke;
use warpui::platform::keyboard::KeyCode;
use galaxyui::event::KeyState;
use galaxyui::keymap::PerPlatformKeystroke;
use galaxyui::platform::keyboard::KeyCode;
const ADD_NEXT_OCCURRENCE_KEYBINDING: &str = "ctrl-g";
@@ -270,7 +270,7 @@ fn new_builder() -> Builder {
pub fn test_add_workflows_to_warp_config() -> Builder {
new_builder()
.with_setup(move |utils| {
utils.set_env("WARP_CONFIG_WATCHER_DELAY_MS", Some((10).to_string()));
utils.set_env("GALAXY_CONFIG_WATCHER_DELAY_MS", Some((10).to_string()));
std::fs::create_dir_all(integration_testing::workflow::workflows_dir())
.expect("Should be able to create workflows dir");
@@ -324,7 +324,7 @@ pub fn test_add_workflows_to_warp_config() -> Builder {
pub fn test_launch_warp_with_theme_in_warp_config() -> Builder {
new_builder()
.with_setup(move |utils| {
utils.set_env("WARP_CONFIG_WATCHER_DELAY_MS", Some((10).to_string()));
utils.set_env("GALAXY_CONFIG_WATCHER_DELAY_MS", Some((10).to_string()));
integration_testing::create_file_from_assets(
TEST_ONLY_ASSETS,
@@ -340,7 +340,7 @@ pub fn test_launch_warp_with_theme_in_warp_config() -> Builder {
pub fn test_add_theme_to_warp_config() -> Builder {
new_builder()
.with_setup(move |utils| {
utils.set_env("WARP_CONFIG_WATCHER_DELAY_MS", Some((10).to_string()));
utils.set_env("GALAXY_CONFIG_WATCHER_DELAY_MS", Some((10).to_string()));
std::fs::create_dir_all(integration_testing::themes::themes_dir())
.expect("Should be able to create themes dir");
@@ -2053,7 +2053,7 @@ pub fn test_add_and_close_session() -> Builder {
.expect("pane at index 0 is a terminal pane")
.as_ref(ctx)
.as_any()
.downcast_ref::<warp::terminal::local_tty::TerminalManager>()
.downcast_ref::<galaxy::terminal::local_tty::TerminalManager>()
.expect("terminal pane at index 0 contains a local session")
.pid()
.expect("shell should be spawned")
@@ -3419,14 +3419,14 @@ pub fn test_warp_auto_title_disabled() -> Builder {
write_rc_files_for_test(
&dir,
r#"
WARP_DISABLE_AUTO_TITLE="1"
GALAXY_DISABLE_AUTO_TITLE="1"
"#,
[ShellRcType::Bash],
);
write_rc_files_for_test(
&dir,
r#"
WARP_DISABLE_AUTO_TITLE="true"
GALAXY_DISABLE_AUTO_TITLE="true"
"#,
[ShellRcType::Zsh],
);
crates/integration/src/test/agent_mode.rs
+3 -3
View File
@@ -8,7 +8,7 @@ use crate::{util::skip_if_powershell_core_2303, Builder};
use lazy_static::lazy_static;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use settings::ToggleableSetting;
use warp::{
use galaxy::{
cmd_or_ctrl_shift,
features::FeatureFlag,
integration_testing::{
@@ -23,7 +23,7 @@ use warp::{
settings::SelectionSettings,
};
use warp_multi_agent_api as api;
use warpui::{async_assert, integration::TestStep, text::SelectionType, Event, SingletonEntity};
use galaxyui::{async_assert, integration::TestStep, text::SelectionType, Event, SingletonEntity};
cfg_if::cfg_if! {
if #[cfg(target_os = "linux")] {
@@ -104,7 +104,7 @@ fn builder_with_setup() -> Builder {
}
fn markdown_visuals_fixture_directory() -> String {
let fixture_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../warpui_core/test_data");
let fixture_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../galaxyui_core/test_data");
fixture_dir
.canonicalize()
.unwrap_or(fixture_dir)
crates/integration/src/test/ai_assistant.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use crate::Builder;
use warp::integration_testing::{
use galaxy::integration_testing::{
step::new_step_with_default_assertions,
terminal::{
assert_selected_block_index_is_last_renderable, execute_command_for_single_terminal_in_tab,
@@ -7,7 +7,7 @@ use warp::integration_testing::{
},
view_getters::ai_assistant_panel_view,
};
use warpui::async_assert;
use galaxyui::async_assert;
use super::new_builder;
crates/integration/src/test/block_filtering.rs
+11 -11
View File
@@ -13,21 +13,21 @@ use crate::test::integration_testing::terminal::{
use crate::test::new_step_with_default_assertions;
use crate::test::toggle_setting;
use crate::test::TestStep;
use warp::cmd_or_ctrl_shift;
use warp::integration_testing::terminal::util::current_shell_starter_and_version;
use warp::integration_testing::terminal::{
use galaxy::cmd_or_ctrl_shift;
use galaxy::integration_testing::terminal::util::current_shell_starter_and_version;
use galaxy::integration_testing::terminal::{
assert_context_menu_is_open, initialize_secret_regexes,
wait_until_bootstrapped_single_pane_for_tab,
};
use warp::integration_testing::view_getters::single_terminal_view_for_tab;
use galaxy::integration_testing::view_getters::single_terminal_view_for_tab;
use warp::settings_view::PrivacyPageAction;
use warp::settings_view::SettingsAction;
use warp::terminal::model::index::Point;
use warp::terminal::model::terminal_model::{BlockIndex, WithinBlock, WithinModel};
use warp::terminal::shell::ShellType;
use warp::terminal::GridType;
use warpui::{async_assert, async_assert_eq};
use galaxy::settings_view::PrivacyPageAction;
use galaxy::settings_view::SettingsAction;
use galaxy::terminal::model::index::Point;
use galaxy::terminal::model::terminal_model::{BlockIndex, WithinBlock, WithinModel};
use galaxy::terminal::shell::ShellType;
use galaxy::terminal::GridType;
use galaxyui::{async_assert, async_assert_eq};
use crate::Builder;
crates/integration/src/test/bootstrapping.rs
+2 -2
View File
@@ -2,7 +2,7 @@
use settings::Setting as _;
use version_compare::Cmp;
use warp::{
use galaxy::{
cmd_or_ctrl_shift,
integration_testing::{
input::{
@@ -24,7 +24,7 @@ use warp::{
terminal::shell::{self, ShellType},
workspace::Workspace,
};
use warpui::{
use galaxyui::{
async_assert, async_assert_eq, clipboard::ClipboardContent, integration::TestStep, ViewHandle,
};
crates/integration/src/test/code_review.rs
+3 -3
View File
@@ -6,8 +6,8 @@ use std::{
use command::blocking::Command;
use warp::features::FeatureFlag;
use warp::{
use galaxy::features::FeatureFlag;
use galaxy::{
integration_testing::{
code_review::{
assert_code_review_anchor, assert_code_review_line_text, assert_code_review_loaded,
@@ -20,7 +20,7 @@ use warp::{
},
workspace::WorkspaceAction,
};
use warpui::{
use galaxyui::{
async_assert,
integration::{AssertionCallback, TestStep},
App, WindowId,
crates/integration/src/test/ctrl_d.rs
+2 -2
View File
@@ -1,6 +1,6 @@
//! Integration tests for CTRL-D / EOT behaviour.
use warp::{
use galaxy::{
integration_testing::{
step::new_step_with_default_assertions,
terminal::{
@@ -15,7 +15,7 @@ use warp::{
terminal::{model::bootstrap::BootstrapStage, shell::ShellType, TerminalView},
workspace::Workspace,
};
use warpui::integration::TestStep;
use galaxyui::integration::TestStep;
use super::{new_builder, Builder};
use crate::util::write_all_rc_files_for_test;
crates/integration/src/test/file_tree.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use super::{new_builder, Builder};
use regex::Regex;
use warp::{
use galaxy::{
integration_testing::{
step::new_step_with_default_assertions,
tab::assert_pane_title,
@@ -10,7 +10,7 @@ use warp::{
},
workspace::WorkspaceAction,
};
use warpui::{async_assert, async_assert_eq, integration::TestStep, App};
use galaxyui::{async_assert, async_assert_eq, integration::TestStep, App};
use crate::util::write_all_rc_files_for_test;
crates/integration/src/test/goto_line.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use super::{new_builder, Builder};
use regex::Regex;
use warp::{
use galaxy::{
integration_testing::{
goto_line::{
assert_cursor_at_line, assert_cursor_at_line_and_column,
@@ -14,7 +14,7 @@ use warp::{
},
workspace::WorkspaceAction,
};
use warpui::{async_assert_eq, App};
use galaxyui::{async_assert_eq, App};
use crate::util::write_all_rc_files_for_test;
crates/integration/src/test/history.rs
+2 -2
View File
@@ -2,7 +2,7 @@ use std::collections::HashMap;
use crate::Builder;
use settings::Setting as _;
use warp::{
use galaxy::{
integration_testing::{
self,
command_search::{assert_command_search_is_open, assert_history_filter_is_active},
@@ -15,7 +15,7 @@ use warp::{
sqlite_testing::set_user_and_hostname_for_commands,
terminal::{input::Input, model::session::get_local_hostname, shell::ShellType},
};
use warpui::{async_assert, ViewHandle};
use galaxyui::{async_assert, ViewHandle};
use crate::util::{get_local_user, write_histfiles_for_test};
crates/integration/src/test/input.rs
+4 -4
View File
@@ -1,8 +1,8 @@
use std::time::Duration;
use warp::integration_testing::terminal::util::current_shell_starter_and_version;
use warp::terminal::shell::ShellType;
use warp::{
use galaxy::integration_testing::terminal::util::current_shell_starter_and_version;
use galaxy::terminal::shell::ShellType;
use galaxy::{
features::FeatureFlag,
integration_testing::{
clipboard::write_to_clipboard,
@@ -18,7 +18,7 @@ use warp::{
view_getters::{single_input_view_for_tab, single_terminal_view_for_tab},
},
};
use warpui::{async_assert_eq, integration::TestStep, Event};
use galaxyui::{async_assert_eq, integration::TestStep, Event};
use crate::Builder;
crates/integration/src/test/keyboard_protocol.rs
+7 -7
View File
@@ -1,7 +1,7 @@
use std::time::Duration;
use warp::features::FeatureFlag;
use warp::integration_testing::{
use galaxy::features::FeatureFlag;
use galaxy::integration_testing::{
step::new_step_with_default_assertions,
terminal::{
assert_long_running_block_executing_for_single_terminal_in_tab,
@@ -9,10 +9,10 @@ use warp::integration_testing::{
},
view_getters::single_terminal_view_for_tab,
};
use warpui::event::{KeyEventDetails, KeyState};
use warpui::keymap::Keystroke;
use warpui::platform::keyboard::KeyCode;
use warpui::{async_assert, integration::TestStep, Event};
use galaxyui::event::{KeyEventDetails, KeyState};
use galaxyui::keymap::Keystroke;
use galaxyui::platform::keyboard::KeyCode;
use galaxyui::{async_assert, integration::TestStep, Event};
use crate::Builder;
@@ -50,7 +50,7 @@ fn wait_for_protocol_enabled() -> TestStep {
fn assert_output_contains(
expected: &'static str,
description: &'static str,
) -> impl FnMut(&mut warpui::App, warpui::WindowId) -> warpui::integration::AssertionOutcome {
) -> impl FnMut(&mut galaxyui::App, galaxyui::WindowId) -> galaxyui::integration::AssertionOutcome {
move |app, window_id| {
let terminal_view = single_terminal_view_for_tab(app, window_id, 0);
terminal_view.read(app, |view, _ctx| {
crates/integration/src/test/launch_configs.rs
+23 -23
View File
@@ -1,6 +1,6 @@
use std::{path::PathBuf, time::Duration};
use warpui::{
use galaxyui::{
async_assert,
integration::{AssertionOutcome, TestStep},
ModelHandle,
@@ -8,22 +8,22 @@ use warpui::{
use super::{assert_approx_eq, new_builder, TEST_ONLY_ASSETS};
use crate::Builder;
use warp::integration_testing::{
use galaxy::integration_testing::{
pane_group::assert_focused_pane_index,
window::assert_num_windows_open,
workspace::{assert_focused_tab_index, assert_tab_count},
};
use warp::integration_testing::{
use galaxy::integration_testing::{
step::new_step_with_default_assertions,
terminal::{validate_block_output, wait_until_bootstrapped_single_pane_for_tab},
};
use warp::search::command_palette::launch_config;
use warp::workspace::NEW_TAB_BUTTON_POSITION_ID;
use warp::{features::FeatureFlag, integration_testing::settings::set_window_custom_size};
use warp::{
use galaxy::search::command_palette::launch_config;
use galaxy::workspace::NEW_TAB_BUTTON_POSITION_ID;
use galaxy::{features::FeatureFlag, integration_testing::settings::set_window_custom_size};
use galaxy::{
integration_testing::type_getters::get_launch_config_ui_location, search::SyncDataSource,
};
use warp::{
use galaxy::{
integration_testing::{self},
search::data_source::Query,
};
@@ -104,9 +104,9 @@ pub fn test_with_launch_config() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
warp::root_view::OpenLaunchConfigArg {
galaxy::root_view::OpenLaunchConfigArg {
launch_config:
warp::launch_configs::launch_config::make_mock_single_window_launch_config(),
galaxy::launch_configs::launch_config::make_mock_single_window_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
},
@@ -164,10 +164,10 @@ pub fn test_open_launch_config_from_add_tab_menu_legacy() -> Builder {
}
pub fn test_launch_config_single_child_branch() -> Builder {
use warp::launch_configs::launch_config::{
use galaxy::launch_configs::launch_config::{
LaunchConfig, PaneMode, PaneTemplateType, SplitDirection, TabTemplate, WindowTemplate,
};
use warpui::actions::StandardAction;
use galaxyui::actions::StandardAction;
/// Create a launch config that has a branch with a single child
fn create_launch_config() -> LaunchConfig {
@@ -201,7 +201,7 @@ pub fn test_launch_config_single_child_branch() -> Builder {
.with_action(move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
warp::root_view::OpenLaunchConfigArg {
galaxy::root_view::OpenLaunchConfigArg {
launch_config: create_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
@@ -233,9 +233,9 @@ pub fn test_open_launch_config_with_custom_size() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
warp::root_view::OpenLaunchConfigArg {
galaxy::root_view::OpenLaunchConfigArg {
launch_config:
warp::launch_configs::launch_config::make_mock_single_window_launch_config(),
galaxy::launch_configs::launch_config::make_mock_single_window_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
},
@@ -273,9 +273,9 @@ pub fn test_open_launch_config_in_active_window() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
warp::root_view::OpenLaunchConfigArg {
galaxy::root_view::OpenLaunchConfigArg {
launch_config:
warp::launch_configs::launch_config::make_mock_single_window_launch_config(),
galaxy::launch_configs::launch_config::make_mock_single_window_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: true,
},
@@ -294,7 +294,7 @@ pub fn test_open_launch_config_in_active_window() -> Builder {
}
pub fn test_with_launch_config_with_active_tab_index() -> Builder {
use warp::launch_configs::launch_config::{
use galaxy::launch_configs::launch_config::{
LaunchConfig, PaneMode, PaneTemplateType, SplitDirection, TabTemplate, WindowTemplate,
};
@@ -336,7 +336,7 @@ pub fn test_with_launch_config_with_active_tab_index() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
warp::root_view::OpenLaunchConfigArg {
galaxy::root_view::OpenLaunchConfigArg {
launch_config: create_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
@@ -353,7 +353,7 @@ pub fn test_with_launch_config_with_active_tab_index() -> Builder {
}
pub fn test_with_launch_config_with_active_pane() -> Builder {
use warp::launch_configs::launch_config::{
use galaxy::launch_configs::launch_config::{
LaunchConfig, PaneMode, PaneTemplateType, SplitDirection, TabTemplate, WindowTemplate,
};
@@ -413,7 +413,7 @@ pub fn test_with_launch_config_with_active_pane() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
warp::root_view::OpenLaunchConfigArg {
galaxy::root_view::OpenLaunchConfigArg {
launch_config: create_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
@@ -431,7 +431,7 @@ pub fn test_with_launch_config_with_active_pane() -> Builder {
}
pub fn test_with_launch_config_with_no_active_pane() -> Builder {
use warp::launch_configs::launch_config::{
use galaxy::launch_configs::launch_config::{
LaunchConfig, PaneMode, PaneTemplateType, SplitDirection, TabTemplate, WindowTemplate,
};
@@ -491,7 +491,7 @@ pub fn test_with_launch_config_with_no_active_pane() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
warp::root_view::OpenLaunchConfigArg {
galaxy::root_view::OpenLaunchConfigArg {
launch_config: create_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
crates/integration/src/test/notebooks.rs
+2 -2
View File
@@ -1,4 +1,4 @@
use warp::{
use galaxy::{
cmd_or_ctrl_shift,
features::FeatureFlag,
integration_testing::{
@@ -20,7 +20,7 @@ use warp::{
window::{add_and_save_window, close_window, save_active_window_id},
},
};
use warpui::integration::TestStep;
use galaxyui::integration::TestStep;
use super::{new_builder, Builder};
crates/integration/src/test/pane_restoration.rs
+23 -23
View File
@@ -3,7 +3,7 @@
use super::{new_builder, Builder};
use std::{collections::HashMap, time::Duration};
use warp::{
use galaxy::{
cmd_or_ctrl_shift,
features::FeatureFlag,
integration_testing::{
@@ -201,23 +201,23 @@ pub fn test_undo_close_grace_period_cleanup() -> Builder {
.with_step(
new_step_with_default_assertions("Check pane count before undo close")
.add_assertion(move |app, window_id| {
let workspace_view = warp::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
let initial_pane_count = workspace_view.read(app, |workspace, ctx| {
let pane_group_view = workspace.get_pane_group_view(0).expect("should have tab 0");
pane_group_view.read(ctx, |pane_group, _| pane_group.pane_count())
});
warpui::async_assert_eq!(initial_pane_count, 1, "Should have exactly one pane after grace period expires - closed pane should be cleaned up")
galaxyui::async_assert_eq!(initial_pane_count, 1, "Should have exactly one pane after grace period expires - closed pane should be cleaned up")
}),
)
.with_step(trigger_undo_close()
.add_assertion(assert_focused_pane_index(0, 0)) // Should still be focused on original pane
.add_assertion(move |app, window_id| {
// Assert we still only have one pane (no restoration occurred)
let workspace_view = warp::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
workspace_view.read(app, |workspace, ctx| {
let pane_group_view = workspace.get_pane_group_view(0).expect("should have tab 0");
let pane_count = pane_group_view.read(ctx, |pane_group, _| pane_group.pane_count());
warpui::async_assert_eq!(pane_count, 1, "Should still have only one pane after attempted restore - no pane should be restored")
galaxyui::async_assert_eq!(pane_count, 1, "Should still have only one pane after attempted restore - no pane should be restored")
})
}),
)
@@ -272,7 +272,7 @@ pub fn test_closed_panes_cleared_on_rearrangement() -> Builder {
))
.with_step(
// Close the middle pane by using a direct operation targeting pane index 1
warp::integration_testing::pane_group::close_pane_by_index(
galaxy::integration_testing::pane_group::close_pane_by_index(
0, // tab index
1, // pane index - the middle pane
),
@@ -280,27 +280,27 @@ pub fn test_closed_panes_cleared_on_rearrangement() -> Builder {
.with_step(
new_step_with_default_assertions("Verify we have 2 visible panes after closing one")
.add_assertion(move |app, window_id| {
let workspace_view = warp::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
workspace_view.read(app, |workspace, ctx| {
let pane_group_view = workspace.get_pane_group_view(0).expect("should have tab 0");
let (visible_pane_count, total_pane_count) = pane_group_view.read(ctx, |pane_group, _| {
(pane_group.visible_pane_count(), pane_group.pane_count())
});
if visible_pane_count != 2 {
warpui::integration::AssertionOutcome::failure(format!("Should have 2 visible panes after closing one (got {visible_pane_count} visible, {total_pane_count} total)"))
galaxyui::integration::AssertionOutcome::failure(format!("Should have 2 visible panes after closing one (got {visible_pane_count} visible, {total_pane_count} total)"))
} else {
warpui::integration::AssertionOutcome::Success
galaxyui::integration::AssertionOutcome::Success
}
})
}),
)
.with_step(
// Trigger pane rearrangement by moving panes
warp::integration_testing::pane_group::move_pane_by_indices(
galaxy::integration_testing::pane_group::move_pane_by_indices(
0,
0,
1,
warp::pane_group::tree::Direction::Right,
galaxy::pane_group::tree::Direction::Right,
),
)
.with_step(
@@ -310,31 +310,31 @@ pub fn test_closed_panes_cleared_on_rearrangement() -> Builder {
.with_step(
new_step_with_default_assertions("Verify pane was NOT restored - still have same visible panes")
.add_assertion(move |app, window_id| {
let workspace_view = warp::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
workspace_view.read(app, |workspace, ctx| {
let pane_group_view = workspace.get_pane_group_view(0).expect("should have tab 0");
let visible_pane_count = pane_group_view.read(ctx, |pane_group, _| pane_group.visible_pane_count());
// After rearrangement, we should still have the same visible panes (no restoration)
// The exact count might vary based on how the move operation affects the layout
if visible_pane_count < 1 {
warpui::integration::AssertionOutcome::failure(format!("Should have at least 1 visible pane after undo close attempt, got {visible_pane_count}"))
galaxyui::integration::AssertionOutcome::failure(format!("Should have at least 1 visible pane after undo close attempt, got {visible_pane_count}"))
} else {
warpui::integration::AssertionOutcome::Success
galaxyui::integration::AssertionOutcome::Success
}
})
}),
)
.with_step(
trigger_undo_close().add_assertion(move |app, window_id| {
let workspace_view = warp::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
workspace_view.read(app, |workspace, ctx| {
let pane_group_view = workspace.get_pane_group_view(0).expect("should have tab 0");
let visible_pane_count = pane_group_view.read(ctx, |pane_group, _| pane_group.visible_pane_count());
// Should still have the same panes, no restoration should occur
if visible_pane_count < 1 {
warpui::integration::AssertionOutcome::failure(format!("Should have at least 1 visible pane after second undo close attempt, got {visible_pane_count}"))
galaxyui::integration::AssertionOutcome::failure(format!("Should have at least 1 visible pane after second undo close attempt, got {visible_pane_count}"))
} else {
warpui::integration::AssertionOutcome::Success
galaxyui::integration::AssertionOutcome::Success
}
})
})
@@ -342,7 +342,7 @@ pub fn test_closed_panes_cleared_on_rearrangement() -> Builder {
.with_step(
new_step_with_default_assertions("Verify remaining pane has expected state")
.add_assertion(move |app, window_id| {
let workspace_view = warp::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
let visible_pane_count = workspace_view.read(app, |workspace, ctx| {
let pane_group_view = workspace.get_pane_group_view(0).expect("should have tab 0");
pane_group_view.read(ctx, |pane_group, _| pane_group.visible_pane_count())
@@ -367,13 +367,13 @@ pub fn test_closed_panes_cleared_on_rearrangement() -> Builder {
0, 0, window_id, app,
);
match (original_result, third_result) {
(warpui::integration::AssertionOutcome::Success, warpui::integration::AssertionOutcome::Success) => {
warpui::integration::AssertionOutcome::Success
(galaxyui::integration::AssertionOutcome::Success, galaxyui::integration::AssertionOutcome::Success) => {
galaxyui::integration::AssertionOutcome::Success
}
_ => warpui::integration::AssertionOutcome::failure("Expected to find both original_pane and third_pane content".to_string())
_ => galaxyui::integration::AssertionOutcome::failure("Expected to find both original_pane and third_pane content".to_string())
}
} else {
warpui::integration::AssertionOutcome::failure(format!("Unexpected pane count: {visible_pane_count}"))
galaxyui::integration::AssertionOutcome::failure(format!("Unexpected pane count: {visible_pane_count}"))
}
}),
)
@@ -448,7 +448,7 @@ pub fn test_tab_closes_when_last_visible_pane_closed() -> Builder {
.set_pause_on_failure(std::time::Duration::from_secs(30))
.add_assertion(move |app, window_id| {
let workspace_view =
warp::integration_testing::view_getters::workspace_view(app, window_id);
galaxy::integration_testing::view_getters::workspace_view(app, window_id);
workspace_view.read(app, |workspace, _ctx| {
let focused_tab_idx = workspace.active_tab_index();
crates/integration/src/test/preview_config_migration.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use std::fs;
use std::path::PathBuf;
use warpui::integration::{AssertionOutcome, TestStep};
use galaxyui::integration::{AssertionOutcome, TestStep};
use crate::Builder;
@@ -37,7 +37,7 @@ pub fn test_preview_config_dir_migration() -> Builder {
// integration channel is Integration, not Preview, so the public
// entry point would no-op.
let new_dir = home.join(".warp-preview");
warp::integration_testing::preview_config_migration::run_config_dir_symlink_migration(
galaxy::integration_testing::preview_config_migration::run_config_dir_symlink_migration(
&old_dir, &new_dir,
);
})
crates/integration/src/test/rules.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warp::integration_testing::{
use galaxy::integration_testing::{
rules::{
assert_rule_count, assert_rule_exists, assert_rule_pane_open, create_a_personal_rule,
open_rule_pane, update_rule_content,
crates/integration/src/test/secrets.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use warp::integration_testing::terminal::{
use galaxy::integration_testing::terminal::{
initialize_secret_regexes, open_context_menu_for_selected_block,
};
use warp::{
use galaxy::{
integration_testing::{
clipboard::assert_clipboard_contains_string,
secret_redaction::{assert_secret_tooltip_open, assert_secrets_redacted_for_ai},
@@ -17,7 +17,7 @@ use warp::{
settings_view::{PrivacyPageAction, SettingsAction},
terminal::model::{index::Point, terminal_model::WithinModel},
};
use warpui::{async_assert, integration::TestStep};
use galaxyui::{async_assert, integration::TestStep};
use crate::util::skip_if_powershell_core_2303;
crates/integration/src/test/session_restoration.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use settings::{RespectUserSyncSetting, SyncToCloud};
use warp::{
use galaxy::{
features::FeatureFlag,
integration_testing::{
self,
@@ -23,7 +23,7 @@ use warp::{
},
workspace::Workspace,
};
use warpui::{
use galaxyui::{
async_assert_eq,
integration::{AssertionOutcome, TestStep},
SingletonEntity, ViewHandle,
crates/integration/src/test/settings_file_errors.rs
+3 -3
View File
@@ -6,20 +6,20 @@
//! when the file is fixed.
use std::time::Duration;
use warp::{
use galaxy::{
features::FeatureFlag,
integration_testing::{
step::new_step_with_default_assertions,
terminal::wait_until_bootstrapped_single_pane_for_tab, view_getters::workspace_view,
},
};
use warpui::{async_assert, integration::TestStep};
use galaxyui::{async_assert, integration::TestStep};
use super::{new_builder, Builder};
/// Helper: returns the path to the TOML settings file.
fn toml_file_path() -> std::path::PathBuf {
warp::settings::user_preferences_toml_file_path()
galaxy::settings::user_preferences_toml_file_path()
}
// ---------------------------------------------------------------------------
crates/integration/src/test/settings_file_hot_reload.rs
+3 -3
View File
@@ -6,7 +6,7 @@
use settings::Setting as _;
use std::time::Duration;
use warp::{
use galaxy::{
features::FeatureFlag,
integration_testing::{
step::new_step_with_default_assertions,
@@ -14,13 +14,13 @@ use warp::{
},
settings::FontSettings,
};
use warpui::{async_assert_eq, integration::TestStep, SingletonEntity};
use galaxyui::{async_assert_eq, integration::TestStep, SingletonEntity};
use super::{new_builder, Builder};
/// Helper: returns the path to the TOML settings file.
fn toml_file_path() -> std::path::PathBuf {
warp::settings::user_preferences_toml_file_path()
galaxy::settings::user_preferences_toml_file_path()
}
/// Verifies the full settings hot-reload pipeline end-to-end: the filesystem
crates/integration/src/test/settings_file_migration.rs
+3 -3
View File
@@ -4,12 +4,12 @@
use std::collections::HashMap;
use settings::Setting as _;
use warp::{
use galaxy::{
features::FeatureFlag,
integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab,
settings::{BlockVisibilitySettings, ScrollSettings},
};
use warpui::{async_assert, async_assert_eq, integration::AssertionOutcome, SingletonEntity};
use galaxyui::{async_assert, async_assert_eq, integration::AssertionOutcome, SingletonEntity};
use super::{new_builder, Builder};
@@ -66,7 +66,7 @@ pub fn test_settings_file_migration_from_native_store() -> Builder {
.add_named_assertion(
"TOML settings file should contain the migrated settings",
move |_app, _window_id| {
let toml_path = warp::settings::user_preferences_toml_file_path();
let toml_path = galaxy::settings::user_preferences_toml_file_path();
let contents = match std::fs::read_to_string(&toml_path) {
Ok(c) => c,
Err(err) => {
crates/integration/src/test/settings_private.rs
+4 -4
View File
@@ -6,7 +6,7 @@
use std::collections::HashMap;
use settings::Setting as _;
use warp::{
use galaxy::{
features::FeatureFlag,
integration_testing::{
step::new_step_with_default_assertions,
@@ -14,21 +14,21 @@ use warp::{
},
settings::{CodeSettings, DebugSettings, FontSettings},
};
use warpui::{async_assert, async_assert_eq, integration::TestStep, SingletonEntity};
use galaxyui::{async_assert, async_assert_eq, integration::TestStep, SingletonEntity};
use super::{new_builder, Builder};
/// Helper: read the TOML settings file from disk and return its contents.
/// Returns an empty string if the file does not exist.
fn read_toml_file() -> String {
let path = warp::settings::user_preferences_toml_file_path();
let path = galaxy::settings::user_preferences_toml_file_path();
std::fs::read_to_string(path).unwrap_or_default()
}
/// Helper: read the JSON user preferences file from disk and return its contents.
/// Returns an empty string if the file does not exist.
fn read_json_prefs_file() -> String {
let path = warp::settings::user_preferences_file_path();
let path = galaxy::settings::user_preferences_file_path();
std::fs::read_to_string(path).unwrap_or_default()
}
crates/integration/src/test/ssh.rs
+2 -2
View File
@@ -3,7 +3,7 @@ use std::collections::HashMap;
use crate::Builder;
use regex::Regex;
use settings::Setting as _;
use warp::{
use galaxy::{
features::FeatureFlag,
integration_testing::{
step::new_step_with_default_assertions,
@@ -28,7 +28,7 @@ use warp::{
shell::ShellType,
},
};
use warpui::{
use galaxyui::{
async_assert, async_assert_eq,
integration::{AssertionCallback, AssertionOutcome, TestStep},
};
crates/integration/src/test/subshell.rs
+9 -9
View File
@@ -1,11 +1,11 @@
use std::collections::HashMap;
use settings::Setting as _;
use warp::integration_testing::terminal::util::current_shell_starter_and_version;
use warp::integration_testing::view_getters::single_input_view_for_tab;
use warp::root_view::SubshellCommandArg;
use warp::terminal::shell::ShellType;
use warp::{
use galaxy::integration_testing::terminal::util::current_shell_starter_and_version;
use galaxy::integration_testing::view_getters::single_input_view_for_tab;
use galaxy::root_view::SubshellCommandArg;
use galaxy::terminal::shell::ShellType;
use galaxy::{
integration_testing::{
step::new_step_with_default_assertions,
subshell::{
@@ -18,10 +18,10 @@ use warp::{
},
terminal::warpify::settings::AddedSubshellCommands,
};
use warpui::integration::{AssertionOutcome, TestStep};
use warpui::windowing::state::ApplicationStage;
use warpui::windowing::WindowManager;
use warpui::{async_assert, UpdateModel};
use galaxyui::integration::{AssertionOutcome, TestStep};
use galaxyui::windowing::state::ApplicationStage;
use galaxyui::windowing::WindowManager;
use galaxyui::{async_assert, UpdateModel};
use crate::util::skip_if_powershell_core_2303;
crates/integration/src/test/sync_inputs.rs
+2 -2
View File
@@ -1,4 +1,4 @@
use warp::{
use galaxy::{
cmd_or_ctrl_shift,
integration_testing::{
step::new_step_with_default_assertions,
@@ -12,7 +12,7 @@ use warp::{
},
workspace::WorkspaceAction,
};
use warpui::{async_assert, async_assert_eq, integration::TestStep};
use galaxyui::{async_assert, async_assert_eq, integration::TestStep};
use crate::util::{get_input_buffer, skip_if_powershell_core_2303};
crates/integration/src/test/typeahead.rs
+3 -3
View File
@@ -1,4 +1,4 @@
use warp::{
use galaxy::{
integration_testing::{
agent_mode::AgentViewState,
step::new_step_with_default_assertions,
@@ -15,7 +15,7 @@ use warp::{
shell::{Shell, ShellType},
},
};
use warpui::{
use galaxyui::{
async_assert, async_assert_eq,
integration::{AssertionCallback, AssertionOutcome, TestStep},
};
@@ -212,7 +212,7 @@ pub fn test_input_reporting_powershell() -> Builder {
pub fn test_background_output() -> Builder {
use regex::Regex;
use std::{fs::OpenOptions, io::Write, os::unix::prelude::OpenOptionsExt};
use warp::integration_testing::{
use galaxy::integration_testing::{
block::assert_background_output,
terminal::{execute_command_for_single_terminal_in_tab, util::ExpectedExitStatus},
};
crates/integration/src/test/video_recording.rs
+5 -5
View File
@@ -2,13 +2,13 @@ use std::future::Future;
use std::pin::Pin;
use pathfinder_geometry::vector::vec2f;
use warpui::event::{Event, ModifiersState};
use warpui::integration::{TestStep, ARTIFACTS_DIR_ENV_VAR};
use galaxyui::event::{Event, ModifiersState};
use galaxyui::integration::{TestStep, ARTIFACTS_DIR_ENV_VAR};
use crate::Builder;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::util::ExpectedExitStatus;
use warp::integration_testing::terminal::{
use galaxy::integration_testing::step::new_step_with_default_assertions;
use galaxy::integration_testing::terminal::util::ExpectedExitStatus;
use galaxy::integration_testing::terminal::{
assert_view_has_text_selection, clear_blocklist_to_remove_bootstrapped_blocks,
execute_command_for_single_terminal_in_tab, execute_echo_str,
wait_until_bootstrapped_single_pane_for_tab,
crates/integration/src/test/websockets.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warp::integration_testing::{
use galaxy::integration_testing::{
self,
assertions::{
assert_websocket_has_not_started, assert_websocket_has_started, create_a_personal_workflow,
crates/integration/src/test/workflows.rs
+3 -3
View File
@@ -1,8 +1,8 @@
use std::time::Duration;
use warp::integration_testing::workflow::{
use galaxy::integration_testing::workflow::{
assert_no_team_workflow_pane_open, assert_open_team_workflow_pane_count_equals,
};
use warp::{
use galaxy::{
integration_testing::{
self,
assertions::{go_offline, go_online, join_a_workspace},
@@ -21,7 +21,7 @@ use warp::{
},
workflows::CategoriesView,
};
use warpui::{async_assert_eq, integration::TestStep, ViewHandle};
use galaxyui::{async_assert_eq, integration::TestStep, ViewHandle};
use crate::Builder;
crates/integration/src/test/workspace.rs
+5 -5
View File
@@ -3,10 +3,10 @@
use std::fs;
use settings::Setting as _;
use warp::integration_testing::terminal::assert_long_running_block_executing_for_single_terminal_in_tab;
use warp::integration_testing::view_getters::terminal_view;
use warp::integration_testing::workspace::{assert_tab_count, press_native_modal_button};
use warp::{
use galaxy::integration_testing::terminal::assert_long_running_block_executing_for_single_terminal_in_tab;
use galaxy::integration_testing::view_getters::terminal_view;
use galaxy::integration_testing::workspace::{assert_tab_count, press_native_modal_button};
use galaxy::{
cmd_or_ctrl_shift,
integration_testing::{
pane_group::assert_focused_pane_index,
@@ -19,7 +19,7 @@ use warp::{
settings::PaneSettings,
workspace::NEW_TAB_BUTTON_POSITION_ID,
};
use warpui::{async_assert, integration::TestStep, SingletonEntity};
use galaxyui::{async_assert, integration::TestStep, SingletonEntity};
use crate::{util::skip_if_powershell_core_2303, Builder};
crates/integration/src/user_defaults.rs
+2 -2
View File
@@ -1,6 +1,6 @@
use std::collections::HashMap;
use warp::settings::INPUT_MODE;
use warp::terminal::block_list_viewport::InputMode;
use galaxy::settings::INPUT_MODE;
use galaxy::terminal::block_list_viewport::InputMode;
/// Returns a user defaults map with the `InputMode` set to `input_mode`.
#[allow(dead_code)]
crates/integration/src/util.rs
+3 -3
View File
@@ -12,7 +12,7 @@ use strum_macros::EnumIter;
use version_compare::Version;
use crate::builder::cargo_target_tmpdir;
use warp::{
use galaxy::{
integration_testing::{
terminal::util::{
current_shell_starter_and_version, default_histfile_directory, ExpectedOutput,
@@ -21,9 +21,9 @@ use warp::{
},
terminal::shell::ShellType,
};
use warpui::{App, WindowId};
use galaxyui::{App, WindowId};
use warp::terminal::shell;
use galaxy::terminal::shell;
pub fn get_input_buffer(
app: &App,