From aa4dbcf73fa3a71b910d9bc16ae563dda5a98f4a Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 27 Jun 2025 14:10:19 +0800 Subject: [PATCH] chore: fix test --- libs/client-api-test/src/test_client.rs | 8 +++----- .../appflowy-collaborate/src/collab/collab_manager.rs | 1 - tests/collab/collab_embedding_test.rs | 2 ++ tests/search/document_search.rs | 4 ++++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/client-api-test/src/test_client.rs b/libs/client-api-test/src/test_client.rs index 17f0d952..2e11849e 100644 --- a/libs/client-api-test/src/test_client.rs +++ b/libs/client-api-test/src/test_client.rs @@ -164,10 +164,11 @@ impl TestClient { view_id: &str, view_name: &str, view_layout: ViewLayout, + uid: i64, ) { let mut folder = self.get_folder(*workspace_id).await; let general_space_id = folder - .get_view(&workspace_id.to_string()) + .get_view(&workspace_id.to_string(), uid) .unwrap() .children .first() @@ -181,7 +182,7 @@ impl TestClient { .view; { let mut txn = folder.collab.transact_mut(); - folder.body.views.insert(&mut txn, view, None); + folder.body.views.insert(&mut txn, view, None, uid); } let folder_collab_type = CollabType::Folder; self @@ -215,7 +216,6 @@ impl TestClient { .unwrap() .encode_collab; Folder::from_collab_doc_state( - uid, CollabOrigin::Client(CollabClient::new(uid, self.device_id.clone())), folder_collab.into(), &workspace_id.to_string(), @@ -322,7 +322,6 @@ impl TestClient { } pub async fn get_user_folder(&self) -> Folder { - let uid = self.uid().await; let workspace_id = self.workspace_id().await; let data = self .api_client @@ -335,7 +334,6 @@ impl TestClient { .unwrap(); Folder::from_collab_doc_state( - uid, CollabOrigin::Empty, data.encode_collab.into(), &workspace_id.to_string(), diff --git a/services/appflowy-collaborate/src/collab/collab_manager.rs b/services/appflowy-collaborate/src/collab/collab_manager.rs index dcd3dcfc..ad546443 100644 --- a/services/appflowy-collaborate/src/collab/collab_manager.rs +++ b/services/appflowy-collaborate/src/collab/collab_manager.rs @@ -97,7 +97,6 @@ impl CollabManager { .await? .encoded_collab; - trace!("create folder from collab: {}", workspace_id); let folder = tokio::task::spawn_blocking(move || { Folder::from_collab_doc_state( CollabOrigin::Server, diff --git a/tests/collab/collab_embedding_test.rs b/tests/collab/collab_embedding_test.rs index fe623f03..6cfdf17c 100644 --- a/tests/collab/collab_embedding_test.rs +++ b/tests/collab/collab_embedding_test.rs @@ -42,6 +42,7 @@ async fn document_full_sync_then_search_test() { let object_id = Uuid::new_v4(); let mut local_document = empty_document_editor(&object_id); let test_client = TestClient::new_user().await; + let uid = test_client.uid().await; let workspace_id = test_client.workspace_id().await; let doc_state = local_document.encode_collab().encode_to_bytes().unwrap(); let params = CreateCollabParams { @@ -57,6 +58,7 @@ async fn document_full_sync_then_search_test() { &object_id.to_string(), "AppFlowy", collab_folder::ViewLayout::Document, + uid, ) .await; diff --git a/tests/search/document_search.rs b/tests/search/document_search.rs index 368c2222..b53a6d46 100644 --- a/tests/search/document_search.rs +++ b/tests/search/document_search.rs @@ -24,6 +24,7 @@ async fn test_embedding_when_create_document() { } let mut test_client = TestClient::new_user().await; + let uid = test_client.uid().await; let workspace_id = test_client.workspace_id().await; // Create the first document and wait for its embedding. let object_id_1 = add_document_collab( @@ -32,6 +33,7 @@ async fn test_embedding_when_create_document() { "the_five_dysfunctions_of_a_team.md", "five dysfunctional", true, + uid, ) .await; @@ -183,6 +185,7 @@ async fn add_document_collab( file_name: &str, search_term: &str, wait_embedding: bool, + uid: i64, ) -> Uuid { let object_id = Uuid::new_v4(); let collab = create_document_collab(&object_id.to_string(), file_name).await; @@ -198,6 +201,7 @@ async fn add_document_collab( &object_id.to_string(), search_term, ViewLayout::Document, + uid, ) .await; if wait_embedding {