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

app/src/integration_testing/workspace/assertions.rs

@@ -1,4 +1,5 @@
-use galaxyui::{async_assert_eq, integration::AssertionCallback};
+use galaxyui::async_assert_eq;
+use galaxyui::integration::AssertionCallback;
 
 use crate::integration_testing::view_getters::workspace_view;
 

app/src/integration_testing/workspace/step.rs

@@ -1,9 +1,9 @@
-use galaxyui::{async_assert, integration::TestStep, SingletonEntity};
+use galaxyui::integration::TestStep;
+use galaxyui::{async_assert, SingletonEntity};
 
-use crate::{
-    integration_testing::view_getters::workspace_view, undo_close::UndoCloseStack,
-    workspace::Workspace,
-};
+use crate::integration_testing::view_getters::workspace_view;
+use crate::undo_close::UndoCloseStack;
+use crate::workspace::Workspace;
 
 /// Mock pressing a button on the Warp-native quit modal. Note that this modal is currently only
 /// used on Linux, not macOS.