first pass of merging in warp (doesn't build)

crates/integration/src/test/file_tree.rs

@@ -1,17 +1,13 @@
-use super::{new_builder, Builder};
 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 galaxy::{
-    integration_testing::{
-        step::new_step_with_default_assertions,
-        tab::assert_pane_title,
-        terminal::wait_until_bootstrapped_single_pane_for_tab,
-        view_getters::{pane_group_view, workspace_view},
-    },
-    workspace::WorkspaceAction,
-};
-use galaxyui::{async_assert, async_assert_eq, integration::TestStep, App};
-
+use super::{new_builder, Builder};
 use crate::util::write_all_rc_files_for_test;
 
 fn open_file_tree_panel(app: &mut App) {