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

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
+9 -10
View File
@@ -1,15 +1,12 @@
use galaxy::integration_testing::{
self,
assertions::{
assert_websocket_has_not_started, assert_websocket_has_started, create_a_personal_workflow,
join_a_workspace,
},
terminal::wait_until_bootstrapped_single_pane_for_tab,
use warp::integration_testing::assertions::{
assert_websocket_has_not_started, assert_websocket_has_started, create_a_personal_workflow,
join_a_workspace,
};
use crate::Builder;
use warp::integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab;
use warp::integration_testing::{self};
use super::{new_builder, TEST_ONLY_ASSETS};
use crate::Builder;
/// With no objects and no teams, the websocket should not begin
pub fn test_websocket_does_not_begin_on_startup() -> Builder {
@@ -25,7 +22,9 @@ pub fn test_websocket_begins_on_startup() -> Builder {
integration_testing::create_file_from_assets(
TEST_ONLY_ASSETS,
"cloud_objects.sqlite",
&integration_testing::persistence::database_file_path(),
&integration_testing::persistence::database_file_path_for_scope(
&integration_testing::persistence::PersistenceScope::App,
),
);
})
.with_step(wait_until_bootstrapped_single_pane_for_tab(0))