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

Fix cursor focus and selection in input box, add AWS env var warning box, and remove AWS Bedrock login banner

Browse Source
This commit is contained in:
rkw6086
2026-07-02 14:54:15 -05:00
parent 4770ac06b5
commit 3769646ca6
1194 changed files with 5312 additions and 8032 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/integration/src/bin/integration.rs
+2 -2
View File
@@ -69,7 +69,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.
galaxy::terminal::local_tty::server::run_terminal_server(args);
warp::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.
@@ -107,7 +107,7 @@ pub fn main() -> Result<()> {
}
#[cfg_attr(not(unix), allow(unreachable_code))]
galaxy::run_integration_test(driver)
warp::run_integration_test(driver)
}
/// Type of a function that produces an integration test builder.
crates/integration/src/builder.rs
+2 -2
View File
@@ -180,7 +180,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(galaxy::keyboard::DISABLE_SAVE_ENV_VAR, Some("true"));
utils.set_env(warp::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
@@ -200,7 +200,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 = galaxy::settings::user_preferences_file_path();
let file_path = warp::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
+1 -1
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 galaxyui_core::integration::TestStep;
pub use warp::integration_testing::view_getters;
crates/integration/src/test.rs
+12 -15
View File
@@ -53,6 +53,16 @@ pub use code_review::*;
pub use ctrl_d::*;
pub use file_tree::*;
use float_cmp::assert_approx_eq;
use galaxyui_core::event::KeyState;
use galaxyui_core::integration::{AssertionOutcome, StepData, TestStep};
use galaxyui_core::keymap::{Keystroke, PerPlatformKeystroke, Trigger};
use galaxyui_core::platform::keyboard::KeyCode;
use galaxyui_core::platform::{OperatingSystem, TerminationMode};
use galaxyui_core::units::Lines;
use galaxyui_core::windowing::WindowManager;
use galaxyui_core::{
async_assert, async_assert_eq, AssetProvider, Event, SingletonEntity, UpdateView, ViewHandle,
};
pub use goto_line::*;
pub use history::*;
pub use input::*;
@@ -180,16 +190,6 @@ use warp::workspace::{
Workspace, WorkspaceAction, NEW_SESSION_MENU_BUTTON_POSITION_ID, NEW_TAB_BUTTON_POSITION_ID,
};
use warp::{cmd_or_ctrl_shift, AgentModeEntrypoint};
use galaxyui_core::event::KeyState;
use galaxyui_core::integration::{AssertionOutcome, StepData, TestStep};
use galaxyui_core::keymap::{Keystroke, PerPlatformKeystroke, Trigger};
use galaxyui_core::platform::keyboard::KeyCode;
use galaxyui_core::platform::{OperatingSystem, TerminationMode};
use galaxyui_core::units::Lines;
use galaxyui_core::windowing::WindowManager;
use galaxyui_core::{
async_assert, async_assert_eq, AssetProvider, Event, SingletonEntity, UpdateView, ViewHandle,
};
pub use websockets::*;
pub use workflows::*;
pub use workspace::*;
@@ -3826,9 +3826,7 @@ pub fn test_open_new_tab_with_specific_shell_from_new_session_menu() -> Builder
let mut builder = new_builder()
.set_should_run_test(|| cfg!(windows))
.with_step(wait_until_bootstrapped_single_pane_for_tab(0));
let mut tab_index = 1;
for (shell, test_command) in test_cases {
for (tab_index, (shell, test_command)) in (1..).zip(test_cases) {
let expected =
regex::Regex::new(format!("{}$", shell.name()).as_str()).expect("regex should compile");
builder = builder
@@ -3847,7 +3845,6 @@ pub fn test_open_new_tab_with_specific_shell_from_new_session_menu() -> Builder
ExpectedExitStatus::Success,
expected,
));
tab_index += 1;
}
builder
}
@@ -6792,7 +6789,7 @@ pub fn test_agent_mode_pane_minimum_size() -> Builder {
f32,
pane_width - AGENT_MODE_PANE_DEFAULT_MINIMUM_WIDTH,
0.,
epsilon = 4.
epsilon = 8.
);
AssertionOutcome::Success
crates/integration/src/test/agent_mode.rs
+3 -3
View File
@@ -5,6 +5,9 @@ use std::collections::HashMap;
use std::path::PathBuf;
use std::time::Duration;
use galaxyui_core::integration::TestStep;
use galaxyui_core::text::SelectionType;
use galaxyui_core::{async_assert, Event, SingletonEntity};
use lazy_static::lazy_static;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use settings::ToggleableSetting;
@@ -19,9 +22,6 @@ use warp::integration_testing::terminal::{
use warp::integration_testing::view_getters::single_terminal_view_for_tab;
use warp::settings::SelectionSettings;
use warp_multi_agent_api as api;
use galaxyui_core::integration::TestStep;
use galaxyui_core::text::SelectionType;
use galaxyui_core::{async_assert, Event, SingletonEntity};
use super::new_builder;
use crate::util::skip_if_powershell_core_2303;
crates/integration/src/test/ai_assistant.rs
+1 -1
View File
@@ -1,3 +1,4 @@
use galaxyui_core::async_assert;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::util::ExpectedExitStatus;
use warp::integration_testing::terminal::{
@@ -5,7 +6,6 @@ use warp::integration_testing::terminal::{
wait_until_bootstrapped_single_pane_for_tab,
};
use warp::integration_testing::view_getters::ai_assistant_panel_view;
use galaxyui_core::async_assert;
use super::new_builder;
use crate::Builder;
crates/integration/src/test/block_filtering.rs
+1 -1
View File
@@ -1,3 +1,4 @@
use galaxyui_core::{async_assert, async_assert_eq};
use warp::cmd_or_ctrl_shift;
use warp::integration_testing::terminal::util::current_shell_starter_and_version;
use warp::integration_testing::terminal::{
@@ -10,7 +11,6 @@ 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 galaxyui_core::{async_assert, async_assert_eq};
use super::new_builder;
use crate::test::integration_testing::block_filtering::{
crates/integration/src/test/bootstrapping.rs
+3 -3
View File
@@ -1,5 +1,8 @@
//! Integration tests for bootstrapping logic.
use galaxyui_core::clipboard::ClipboardContent;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert, async_assert_eq, ViewHandle};
use settings::Setting as _;
use version_compare::Cmp;
use warp::cmd_or_ctrl_shift;
@@ -22,9 +25,6 @@ use warp::integration_testing::view_getters::{
use warp::terminal::session_settings::HonorPS1;
use warp::terminal::shell::{self, ShellType};
use warp::workspace::Workspace;
use galaxyui_core::clipboard::ClipboardContent;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert, async_assert_eq, ViewHandle};
use super::{new_builder, Builder};
use crate::util::{write_all_rc_files_for_test, write_rc_files_for_test, ShellRcType};
crates/integration/src/test/code_review.rs
+2 -2
View File
@@ -3,6 +3,8 @@ use std::path::{Path, PathBuf};
use std::time::Duration;
use command::blocking::Command;
use galaxyui_core::integration::{AssertionCallback, TestStep};
use galaxyui_core::{async_assert, App, WindowId};
use warp::features::FeatureFlag;
use warp::integration_testing::code_review::{
assert_code_review_anchor, assert_code_review_line_text, assert_code_review_loaded,
@@ -13,8 +15,6 @@ use warp::integration_testing::code_review::{
use warp::integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab;
use warp::integration_testing::view_getters::{single_terminal_view_for_tab, workspace_view};
use warp::workspace::WorkspaceAction;
use galaxyui_core::integration::{AssertionCallback, TestStep};
use galaxyui_core::{async_assert, App, WindowId};
use super::new_builder;
use crate::util::write_all_rc_files_for_test;
crates/integration/src/test/ctrl_d.rs
+1 -1
View File
@@ -1,5 +1,6 @@
//! Integration tests for CTRL-D / EOT behaviour.
use galaxyui_core::integration::TestStep;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::util::current_shell_starter_and_version;
use warp::integration_testing::terminal::{
@@ -13,7 +14,6 @@ use warp::terminal::model::bootstrap::BootstrapStage;
use warp::terminal::shell::ShellType;
use warp::terminal::TerminalView;
use warp::workspace::Workspace;
use galaxyui_core::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,11 +1,11 @@
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert, async_assert_eq, App};
use regex::Regex;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::tab::assert_pane_title;
use warp::integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab;
use warp::integration_testing::view_getters::{pane_group_view, workspace_view};
use warp::workspace::WorkspaceAction;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert, async_assert_eq, App};
use super::{new_builder, Builder};
use crate::util::write_all_rc_files_for_test;
crates/integration/src/test/goto_line.rs
+1 -1
View File
@@ -1,3 +1,4 @@
use galaxyui_core::{async_assert_eq, App};
use regex::Regex;
use warp::integration_testing::goto_line::{
assert_code_editor_line_numbers, assert_cursor_at_line, assert_cursor_at_line_and_column,
@@ -10,7 +11,6 @@ use warp::integration_testing::terminal::wait_until_bootstrapped_single_pane_for
use warp::integration_testing::view_getters::{pane_group_view, workspace_view};
use warp::settings::CodeEditorLineNumberMode;
use warp::workspace::WorkspaceAction;
use galaxyui_core::{async_assert_eq, App};
use super::{new_builder, Builder};
use crate::util::write_all_rc_files_for_test;
crates/integration/src/test/history.rs
+1 -1
View File
@@ -1,5 +1,6 @@
use std::collections::HashMap;
use galaxyui_core::{async_assert, ViewHandle};
use settings::Setting as _;
use warp::integration_testing::command_search::{
assert_command_search_has_results, assert_command_search_is_open,
@@ -17,7 +18,6 @@ use warp::sqlite_testing::set_user_and_hostname_for_commands;
use warp::terminal::input::Input;
use warp::terminal::model::session::get_local_hostname;
use warp::terminal::shell::ShellType;
use galaxyui_core::{async_assert, ViewHandle};
use super::{new_builder, TEST_ONLY_ASSETS};
use crate::util::{get_local_user, write_histfiles_for_test};
crates/integration/src/test/input.rs
+2 -2
View File
@@ -1,5 +1,7 @@
use std::time::Duration;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert_eq, Event};
use warp::features::FeatureFlag;
use warp::integration_testing::clipboard::write_to_clipboard;
use warp::integration_testing::input::{
@@ -18,8 +20,6 @@ use warp::integration_testing::view_getters::{
single_input_view_for_tab, single_terminal_view_for_tab,
};
use warp::terminal::shell::ShellType;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert_eq, Event};
use super::new_builder;
use crate::Builder;
crates/integration/src/test/keyboard_protocol.rs
+9 -7
View File
@@ -1,5 +1,10 @@
use std::time::Duration;
use galaxyui_core::event::{KeyEventDetails, KeyState};
use galaxyui_core::integration::TestStep;
use galaxyui_core::keymap::Keystroke;
use galaxyui_core::platform::keyboard::KeyCode;
use galaxyui_core::{async_assert, Event};
use warp::features::FeatureFlag;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::{
@@ -7,11 +12,6 @@ use warp::integration_testing::terminal::{
wait_until_bootstrapped_single_pane_for_tab,
};
use warp::integration_testing::view_getters::single_terminal_view_for_tab;
use galaxyui_core::event::{KeyEventDetails, KeyState};
use galaxyui_core::integration::TestStep;
use galaxyui_core::keymap::Keystroke;
use galaxyui_core::platform::keyboard::KeyCode;
use galaxyui_core::{async_assert, Event};
use super::new_builder;
use crate::Builder;
@@ -48,8 +48,10 @@ fn wait_for_protocol_enabled() -> TestStep {
fn assert_output_contains(
expected: &'static str,
description: &'static str,
) -> impl FnMut(&mut galaxyui_core::App, galaxyui_core::WindowId) -> galaxyui_core::integration::AssertionOutcome
{
) -> impl FnMut(
&mut galaxyui_core::App,
galaxyui_core::WindowId,
) -> galaxyui_core::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
+17 -17
View File
@@ -1,6 +1,8 @@
use std::path::PathBuf;
use std::time::Duration;
use galaxyui_core::integration::{AssertionOutcome, TestStep};
use galaxyui_core::{async_assert, ModelHandle};
use warp::features::FeatureFlag;
use warp::integration_testing::pane_group::assert_focused_pane_index;
use warp::integration_testing::settings::set_window_custom_size;
@@ -16,8 +18,6 @@ use warp::search::command_palette::launch_config;
use warp::search::data_source::Query;
use warp::search::SyncDataSource;
use warp::workspace::NEW_TAB_BUTTON_POSITION_ID;
use galaxyui_core::integration::{AssertionOutcome, TestStep};
use galaxyui_core::{async_assert, ModelHandle};
use super::{assert_approx_eq, new_builder, TEST_ONLY_ASSETS};
use crate::Builder;
@@ -98,9 +98,9 @@ pub fn test_with_launch_config() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
galaxy::root_view::OpenLaunchConfigArg {
warp::root_view::OpenLaunchConfigArg {
launch_config:
galaxy::launch_configs::launch_config::make_mock_single_window_launch_config(),
warp::launch_configs::launch_config::make_mock_single_window_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
},
@@ -158,10 +158,10 @@ pub fn test_open_launch_config_from_add_tab_menu_legacy() -> Builder {
}
pub fn test_launch_config_single_child_branch() -> Builder {
use galaxy::launch_configs::launch_config::{
use galaxyui_core::actions::StandardAction;
use warp::launch_configs::launch_config::{
LaunchConfig, PaneMode, PaneTemplateType, SplitDirection, TabTemplate, WindowTemplate,
};
use galaxyui_core::actions::StandardAction;
/// Create a launch config that has a branch with a single child
fn create_launch_config() -> LaunchConfig {
@@ -195,7 +195,7 @@ pub fn test_launch_config_single_child_branch() -> Builder {
.with_action(move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
galaxy::root_view::OpenLaunchConfigArg {
warp::root_view::OpenLaunchConfigArg {
launch_config: create_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
@@ -227,9 +227,9 @@ pub fn test_open_launch_config_with_custom_size() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
galaxy::root_view::OpenLaunchConfigArg {
warp::root_view::OpenLaunchConfigArg {
launch_config:
galaxy::launch_configs::launch_config::make_mock_single_window_launch_config(),
warp::launch_configs::launch_config::make_mock_single_window_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
},
@@ -267,9 +267,9 @@ pub fn test_open_launch_config_in_active_window() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
galaxy::root_view::OpenLaunchConfigArg {
warp::root_view::OpenLaunchConfigArg {
launch_config:
galaxy::launch_configs::launch_config::make_mock_single_window_launch_config(),
warp::launch_configs::launch_config::make_mock_single_window_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: true,
},
@@ -288,7 +288,7 @@ pub fn test_open_launch_config_in_active_window() -> Builder {
}
pub fn test_with_launch_config_with_active_tab_index() -> Builder {
use galaxy::launch_configs::launch_config::{
use warp::launch_configs::launch_config::{
LaunchConfig, PaneMode, PaneTemplateType, SplitDirection, TabTemplate, WindowTemplate,
};
@@ -330,7 +330,7 @@ pub fn test_with_launch_config_with_active_tab_index() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
galaxy::root_view::OpenLaunchConfigArg {
warp::root_view::OpenLaunchConfigArg {
launch_config: create_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
@@ -347,7 +347,7 @@ pub fn test_with_launch_config_with_active_tab_index() -> Builder {
}
pub fn test_with_launch_config_with_active_pane() -> Builder {
use galaxy::launch_configs::launch_config::{
use warp::launch_configs::launch_config::{
LaunchConfig, PaneMode, PaneTemplateType, SplitDirection, TabTemplate, WindowTemplate,
};
@@ -407,7 +407,7 @@ pub fn test_with_launch_config_with_active_pane() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
galaxy::root_view::OpenLaunchConfigArg {
warp::root_view::OpenLaunchConfigArg {
launch_config: create_launch_config(),
ui_location: get_launch_config_ui_location(),
open_in_active_window: false,
@@ -425,7 +425,7 @@ pub fn test_with_launch_config_with_active_pane() -> Builder {
}
pub fn test_with_launch_config_with_no_active_pane() -> Builder {
use galaxy::launch_configs::launch_config::{
use warp::launch_configs::launch_config::{
LaunchConfig, PaneMode, PaneTemplateType, SplitDirection, TabTemplate, WindowTemplate,
};
@@ -485,7 +485,7 @@ pub fn test_with_launch_config_with_no_active_pane() -> Builder {
move |app, _, _| {
app.dispatch_global_action(
"root_view:open_launch_config",
galaxy::root_view::OpenLaunchConfigArg {
warp::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
+1 -1
View File
@@ -1,3 +1,4 @@
use galaxyui_core::integration::TestStep;
use warp::cmd_or_ctrl_shift;
use warp::features::FeatureFlag;
use warp::integration_testing::command_palette::open_command_palette_and_run_action;
@@ -15,7 +16,6 @@ use warp::integration_testing::terminal::{
};
use warp::integration_testing::view_getters::terminal_view;
use warp::integration_testing::window::{add_and_save_window, close_window, save_active_window_id};
use galaxyui_core::integration::TestStep;
use super::{new_builder, Builder};
crates/integration/src/test/pane_restoration.rs
+10 -10
View File
@@ -201,7 +201,7 @@ 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 = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = warp::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())
@@ -213,7 +213,7 @@ pub fn test_undo_close_grace_period_cleanup() -> Builder {
.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 = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = warp::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());
@@ -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
galaxy::integration_testing::pane_group::close_pane_by_index(
warp::integration_testing::pane_group::close_pane_by_index(
0, // tab index
1, // pane index - the middle pane
),
@@ -280,7 +280,7 @@ 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 = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = warp::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, _| {
@@ -296,11 +296,11 @@ pub fn test_closed_panes_cleared_on_rearrangement() -> Builder {
)
.with_step(
// Trigger pane rearrangement by moving panes
galaxy::integration_testing::pane_group::move_pane_by_indices(
warp::integration_testing::pane_group::move_pane_by_indices(
0,
0,
1,
galaxy::pane_group::tree::Direction::Right,
warp::pane_group::tree::Direction::Right,
),
)
.with_step(
@@ -310,7 +310,7 @@ 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 = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = warp::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());
@@ -326,7 +326,7 @@ pub fn test_closed_panes_cleared_on_rearrangement() -> Builder {
)
.with_step(
trigger_undo_close().add_assertion(move |app, window_id| {
let workspace_view = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = warp::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());
@@ -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 = galaxy::integration_testing::view_getters::workspace_view(app, window_id);
let workspace_view = warp::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())
@@ -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 =
galaxy::integration_testing::view_getters::workspace_view(app, window_id);
warp::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
+1 -1
View File
@@ -36,7 +36,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");
galaxy::integration_testing::preview_config_migration::run_config_dir_symlink_migration(
warp::integration_testing::preview_config_migration::run_config_dir_symlink_migration(
&old_dir, &new_dir,
);
})
crates/integration/src/test/remote_server.rs
+1 -1
View File
@@ -1,6 +1,7 @@
use std::collections::HashMap;
use std::time::Duration;
use galaxyui_core::integration::TestStep;
use settings::Setting as _;
use warp::features::FeatureFlag;
use warp::integration_testing::remote_server::{
@@ -24,7 +25,6 @@ use warp::integration_testing::terminal::{
};
use warp::terminal::shell::ShellType;
use warp::terminal::warpify::settings::{SshExtensionInstallMode, SshExtensionInstallModeSetting};
use galaxyui_core::integration::TestStep;
use super::{new_builder, Builder};
crates/integration/src/test/secrets.rs
+2 -2
View File
@@ -1,3 +1,5 @@
use galaxyui_core::async_assert;
use galaxyui_core::integration::TestStep;
use warp::integration_testing::clipboard::assert_clipboard_contains_string;
use warp::integration_testing::secret_redaction::{
assert_secret_tooltip_open, assert_secrets_redacted_for_ai,
@@ -14,8 +16,6 @@ use warp::integration_testing::view_getters::single_terminal_view;
use warp::settings_view::{PrivacyPageAction, SettingsAction};
use warp::terminal::model::index::Point;
use warp::terminal::model::terminal_model::WithinModel;
use galaxyui_core::async_assert;
use galaxyui_core::integration::TestStep;
use super::{new_builder, Builder};
use crate::util::skip_if_powershell_core_2303;
crates/integration/src/test/session_restoration.rs
+2 -2
View File
@@ -1,3 +1,5 @@
use galaxyui_core::integration::{AssertionOutcome, TestStep};
use galaxyui_core::{async_assert_eq, SingletonEntity, ViewHandle};
use settings::{RespectUserSyncSetting, SyncToCloud};
use warp::features::FeatureFlag;
use warp::integration_testing::notebook::{
@@ -19,8 +21,6 @@ use warp::terminal::model::terminal_model::BlockIndex;
use warp::terminal::shell::ShellType;
use warp::terminal::{History, ShellHost, TerminalView};
use warp::workspace::Workspace;
use galaxyui_core::integration::{AssertionOutcome, TestStep};
use galaxyui_core::{async_assert_eq, SingletonEntity, ViewHandle};
use super::{new_builder, Builder, TEST_ONLY_ASSETS};
use crate::util::{get_local_user, tab_title_in_home_dir};
crates/integration/src/test/settings_file_errors.rs
+3 -3
View File
@@ -7,18 +7,18 @@
use std::time::Duration;
use galaxyui_core::async_assert;
use galaxyui_core::integration::TestStep;
use warp::features::FeatureFlag;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab;
use warp::integration_testing::view_getters::workspace_view;
use galaxyui_core::async_assert;
use galaxyui_core::integration::TestStep;
use super::{new_builder, Builder};
/// Helper: returns the path to the TOML settings file.
fn toml_file_path() -> std::path::PathBuf {
galaxy::settings::user_preferences_toml_file_path()
warp::settings::user_preferences_toml_file_path()
}
// ---------------------------------------------------------------------------
crates/integration/src/test/settings_file_hot_reload.rs
+3 -3
View File
@@ -6,19 +6,19 @@
use std::time::Duration;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert_eq, SingletonEntity};
use settings::Setting as _;
use warp::features::FeatureFlag;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab;
use warp::settings::FontSettings;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert_eq, SingletonEntity};
use super::{new_builder, Builder};
/// Helper: returns the path to the TOML settings file.
fn toml_file_path() -> std::path::PathBuf {
galaxy::settings::user_preferences_toml_file_path()
warp::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
@@ -3,12 +3,12 @@
use std::collections::HashMap;
use galaxyui_core::integration::AssertionOutcome;
use galaxyui_core::{async_assert, async_assert_eq, SingletonEntity};
use settings::Setting as _;
use warp::features::FeatureFlag;
use warp::integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab;
use warp::settings::{BlockVisibilitySettings, ScrollSettings};
use galaxyui_core::integration::AssertionOutcome;
use galaxyui_core::{async_assert, async_assert_eq, SingletonEntity};
use super::{new_builder, Builder};
@@ -65,7 +65,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 = galaxy::settings::user_preferences_toml_file_path();
let toml_path = warp::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
@@ -5,27 +5,27 @@
use std::collections::HashMap;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert, async_assert_eq, SingletonEntity};
use settings::Setting as _;
use warp::features::FeatureFlag;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab;
use warp::settings::{CodeSettings, DebugSettings, FontSettings};
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert, async_assert_eq, 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 = galaxy::settings::user_preferences_toml_file_path();
let path = warp::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 = galaxy::settings::user_preferences_file_path();
let path = warp::settings::user_preferences_file_path();
std::fs::read_to_string(path).unwrap_or_default()
}
crates/integration/src/test/ssh.rs
+2 -2
View File
@@ -1,5 +1,7 @@
use std::collections::HashMap;
use galaxyui_core::integration::{AssertionCallback, AssertionOutcome, TestStep};
use galaxyui_core::{async_assert, async_assert_eq};
use regex::Regex;
use settings::Setting as _;
use warp::integration_testing::step::new_step_with_default_assertions;
@@ -19,8 +21,6 @@ use warp::integration_testing::view_getters::{single_terminal_view, single_termi
use warp::terminal::model::bootstrap::BootstrapStage;
use warp::terminal::session_settings::{StartupShell, StartupShellOverride};
use warp::terminal::shell::ShellType;
use galaxyui_core::integration::{AssertionCallback, AssertionOutcome, TestStep};
use galaxyui_core::{async_assert, async_assert_eq};
use super::new_builder;
use crate::Builder;
crates/integration/src/test/subshell.rs
+4 -4
View File
@@ -1,5 +1,9 @@
use std::collections::HashMap;
use galaxyui_core::integration::{AssertionOutcome, TestStep};
use galaxyui_core::windowing::state::ApplicationStage;
use galaxyui_core::windowing::WindowManager;
use galaxyui_core::{async_assert, UpdateModel};
use settings::Setting as _;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::subshell::util::ssh_command;
@@ -14,10 +18,6 @@ use warp::integration_testing::view_getters::single_input_view_for_tab;
use warp::root_view::SubshellCommandArg;
use warp::terminal::shell::ShellType;
use warp::terminal::warpify::settings::AddedSubshellCommands;
use galaxyui_core::integration::{AssertionOutcome, TestStep};
use galaxyui_core::windowing::state::ApplicationStage;
use galaxyui_core::windowing::WindowManager;
use galaxyui_core::{async_assert, UpdateModel};
use super::{new_builder, Builder};
use crate::util::skip_if_powershell_core_2303;
crates/integration/src/test/sync_inputs.rs
+2 -2
View File
@@ -1,3 +1,5 @@
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert, async_assert_eq};
use warp::cmd_or_ctrl_shift;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::util::ExpectedExitStatus;
@@ -8,8 +10,6 @@ use warp::integration_testing::terminal::{
};
use warp::integration_testing::view_getters::{terminal_view, workspace_view};
use warp::workspace::WorkspaceAction;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert, async_assert_eq};
use super::{new_builder, Builder};
use crate::util::{get_input_buffer, skip_if_powershell_core_2303};
crates/integration/src/test/typeahead.rs
+2 -2
View File
@@ -1,3 +1,5 @@
use galaxyui_core::integration::{AssertionCallback, AssertionOutcome, TestStep};
use galaxyui_core::{async_assert, async_assert_eq};
use warp::integration_testing::agent_mode::AgentViewState;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::util::current_shell_starter_and_version;
@@ -9,8 +11,6 @@ use warp::integration_testing::terminal::{
use warp::integration_testing::view_getters::single_terminal_view_for_tab;
use warp::terminal::model::terminal_model::BlockIndex;
use warp::terminal::shell::{Shell, ShellType};
use galaxyui_core::integration::{AssertionCallback, AssertionOutcome, TestStep};
use galaxyui_core::{async_assert, async_assert_eq};
use super::{new_builder, Builder};
use crate::util::skip_if_powershell_core_2303;
crates/integration/src/test/video_recording.rs
+2 -4
View File
@@ -1,8 +1,8 @@
use std::future::Future;
use std::pin::Pin;
use galaxyui::event::{Event, ModifiersState};
use galaxyui::integration::{TestStep, ARTIFACTS_DIR_ENV_VAR};
use galaxyui_core::event::{Event, ModifiersState};
use galaxyui_core::integration::{TestStep, ARTIFACTS_DIR_ENV_VAR};
use pathfinder_geometry::vector::vec2f;
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::util::ExpectedExitStatus;
@@ -11,8 +11,6 @@ use warp::integration_testing::terminal::{
execute_command_for_single_terminal_in_tab, execute_echo_str,
wait_until_bootstrapped_single_pane_for_tab,
};
use galaxyui_core::event::{Event, ModifiersState};
use galaxyui_core::integration::{TestStep, ARTIFACTS_DIR_ENV_VAR};
use crate::Builder;
crates/integration/src/test/workflows.rs
+2 -2
View File
@@ -1,5 +1,7 @@
use std::time::Duration;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert_eq, ViewHandle};
use warp::integration_testing::assertions::{go_offline, go_online, join_a_workspace};
use warp::integration_testing::command_palette::{
open_command_palette_and_run_action, TestStepsExt,
@@ -17,8 +19,6 @@ use warp::integration_testing::workflow::{
};
use warp::integration_testing::{self, view_of_type};
use warp::workflows::CategoriesView;
use galaxyui_core::integration::TestStep;
use galaxyui_core::{async_assert_eq, ViewHandle};
use super::{new_builder, TEST_ONLY_ASSETS};
use crate::Builder;
crates/integration/src/test/workspace.rs
+4 -4
View File
@@ -3,6 +3,10 @@
use std::fs;
use std::time::Duration;
use galaxyui_core::event::{Event, ModifiersState};
use galaxyui_core::integration::{AssertionCallback, AssertionOutcome, StepDataMap, TestStep};
use galaxyui_core::windowing::WindowManager;
use galaxyui_core::{async_assert, async_assert_eq, SingletonEntity, TypedActionView, WindowId};
use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use settings::Setting as _;
@@ -31,10 +35,6 @@ use warp::settings::PaneSettings;
use warp::terminal::shell::ShellType;
use warp::workspace::tab_settings::{TabSettings, VerticalTabsDisplayGranularity};
use warp::workspace::{WorkspaceAction, NEW_TAB_BUTTON_POSITION_ID};
use galaxyui_core::event::{Event, ModifiersState};
use galaxyui_core::integration::{AssertionCallback, AssertionOutcome, StepDataMap, TestStep};
use galaxyui_core::windowing::WindowManager;
use galaxyui_core::{async_assert, async_assert_eq, SingletonEntity, TypedActionView, WindowId};
use super::new_builder;
use crate::util::skip_if_powershell_core_2303;
crates/integration/src/user_defaults.rs
-2
View File
@@ -1,5 +1,3 @@
use galaxy::settings::INPUT_MODE;
use galaxy::terminal::block_list_viewport::InputMode;
use std::collections::HashMap;
use warp::settings::INPUT_MODE;
crates/integration/src/util.rs
+1 -1
View File
@@ -2,6 +2,7 @@ use std::fs::{create_dir_all, write, OpenOptions};
use std::io::Write;
use std::path::{Path, PathBuf};
use galaxyui_core::{App, WindowId};
use itertools::Itertools as _;
use strum::IntoEnumIterator;
use strum_macros::EnumIter;
@@ -12,7 +13,6 @@ use warp::integration_testing::terminal::util::{
use warp::integration_testing::view_getters;
use warp::terminal::shell;
use warp::terminal::shell::ShellType;
use galaxyui_core::{App, WindowId};
use crate::builder::cargo_target_tmpdir;