From 855fa555a3973d0521cb896d274b534150d68a8a Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Sun, 22 Jun 2025 14:37:54 +0300 Subject: [PATCH] tests: Use Server::wait_task() instead of Index::wait_task() in search:: The code is mostly duplicated. Server::wait_task() has better handling for errors and more retries. Signed-off-by: Martin Tzvetanov Grigorov --- crates/meilisearch/tests/search/distinct.rs | 6 +- crates/meilisearch/tests/search/errors.rs | 24 +++--- .../meilisearch/tests/search/facet_search.rs | 54 ++++++------- crates/meilisearch/tests/search/filters.rs | 12 +-- crates/meilisearch/tests/search/formatted.rs | 8 +- crates/meilisearch/tests/search/hybrid.rs | 14 ++-- crates/meilisearch/tests/search/locales.rs | 32 ++++---- .../tests/search/matching_strategy.rs | 2 +- crates/meilisearch/tests/search/mod.rs | 66 +++++++-------- crates/meilisearch/tests/search/multi/mod.rs | 80 +++++++++---------- crates/meilisearch/tests/search/pagination.rs | 4 +- .../tests/search/restrict_searchable.rs | 18 ++--- 12 files changed, 160 insertions(+), 160 deletions(-) diff --git a/crates/meilisearch/tests/search/distinct.rs b/crates/meilisearch/tests/search/distinct.rs index bdc5875e0..33a4c5453 100644 --- a/crates/meilisearch/tests/search/distinct.rs +++ b/crates/meilisearch/tests/search/distinct.rs @@ -152,7 +152,7 @@ async fn distinct_search_with_offset_no_ranking() { let documents = DOCUMENTS.clone(); index.add_documents(documents, Some(DOCUMENT_PRIMARY_KEY)).await; let (task, _status_code) = index.update_distinct_attribute(json!(DOCUMENT_DISTINCT_KEY)).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); fn get_hits(response: &Value) -> Vec<&str> { let hits_array = response["hits"].as_array().unwrap(); @@ -211,7 +211,7 @@ async fn distinct_search_with_pagination_no_ranking() { let documents = DOCUMENTS.clone(); index.add_documents(documents, Some(DOCUMENT_PRIMARY_KEY)).await; let (task, _status_code) = index.update_distinct_attribute(json!(DOCUMENT_DISTINCT_KEY)).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); fn get_hits(response: &Value) -> Vec<&str> { let hits_array = response["hits"].as_array().unwrap(); @@ -281,7 +281,7 @@ async fn distinct_at_search_time() { let documents = NESTED_DOCUMENTS.clone(); index.add_documents(documents, Some(DOCUMENT_PRIMARY_KEY)).await; let (task, _) = index.update_settings_filterable_attributes(json!(["color.main"])).await; - let task = index.wait_task(task.uid()).await.succeeded(); + let task = server.wait_task(task.uid()).await.succeeded(); snapshot!(task, name: "succeed"); fn get_hits(response: &Value) -> Vec { diff --git a/crates/meilisearch/tests/search/errors.rs b/crates/meilisearch/tests/search/errors.rs index eca4a8cfb..363ece067 100644 --- a/crates/meilisearch/tests/search/errors.rs +++ b/crates/meilisearch/tests/search/errors.rs @@ -425,7 +425,7 @@ async fn search_non_filterable_facets() { let index = server.unique_index(); let (response, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await; // Wait for the settings update to complete - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.search_post(json!({"facets": ["doggo"]})).await; snapshot!(code, @"400 Bad Request"); @@ -456,7 +456,7 @@ async fn search_non_filterable_facets_multiple_filterable() { let index = server.unique_index(); let (response, _code) = index.update_settings(json!({"filterableAttributes": ["title", "genres"]})).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.search_post(json!({"facets": ["doggo"]})).await; snapshot!(code, @"400 Bad Request"); @@ -486,7 +486,7 @@ async fn search_non_filterable_facets_no_filterable() { let server = Server::new_shared(); let index = server.unique_index(); let (response, _code) = index.update_settings(json!({"filterableAttributes": []})).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.search_post(json!({"facets": ["doggo"]})).await; snapshot!(code, @"400 Bad Request"); @@ -517,7 +517,7 @@ async fn search_non_filterable_facets_multiple_facets() { let index = server.unique_index(); let (response, _uid) = index.update_settings(json!({"filterableAttributes": ["title", "genres"]})).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.search_post(json!({"facets": ["doggo", "neko"]})).await; snapshot!(code, @"400 Bad Request"); @@ -1001,7 +1001,7 @@ async fn sort_geo_reserved_attribute() { let index = server.unique_index(); let (task, _code) = index.update_settings(json!({"sortableAttributes": ["id"]})).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let expected_response = json!({ "message": "`_geo` is a reserved keyword and thus can't be used as a sort expression. Use the _geoPoint(latitude, longitude) built-in rule to sort on _geo field coordinates.", @@ -1028,7 +1028,7 @@ async fn sort_reserved_attribute() { let index = server.unique_index(); let (task, _code) = index.update_settings(json!({"sortableAttributes": ["id"]})).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let expected_response = json!({ "message": "`_geoDistance` is a reserved keyword and thus can't be used as a sort expression.", @@ -1054,7 +1054,7 @@ async fn sort_unsortable_attribute() { let server = Server::new_shared(); let index = server.unique_index(); let (response, _code) = index.update_settings(json!({"sortableAttributes": ["id"]})).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let expected_response = json!({ "message": format!("Index `{}`: Attribute `title` is not sortable. Available sortable attributes are: `id`.", index.uid), @@ -1081,7 +1081,7 @@ async fn sort_invalid_syntax() { let index = server.unique_index(); let (response, _code) = index.update_settings(json!({"sortableAttributes": ["id"]})).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let expected_response = json!({ "message": "Invalid syntax for the sort parameter: expected expression ending by `:asc` or `:desc`, found `title`.", @@ -1112,7 +1112,7 @@ async fn sort_unset_ranking_rule() { json!({"sortableAttributes": ["title"], "rankingRules": ["proximity", "exactness"]}), ) .await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let expected_response = json!({ "message": format!("Index `{}`: You must specify where `sort` is listed in the rankingRules setting to use the sort parameter at search time.", index.uid), @@ -1199,7 +1199,7 @@ async fn distinct_at_search_time() { let index = server.unique_index(); let (response, _code) = index.add_documents(json!([{"id": 1, "color": "Doggo", "machin": "Action"}]), None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.search_post(json!({"page": 0, "hitsPerPage": 2, "distinct": "doggo.truc"})).await; @@ -1214,7 +1214,7 @@ async fn distinct_at_search_time() { "###); let (task, _) = index.update_settings_filterable_attributes(json!(["color", "machin"])).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.search_post(json!({"page": 0, "hitsPerPage": 2, "distinct": "doggo.truc"})).await; @@ -1229,7 +1229,7 @@ async fn distinct_at_search_time() { "###); let (task, _) = index.update_settings_displayed_attributes(json!(["color"])).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.search_post(json!({"page": 0, "hitsPerPage": 2, "distinct": "doggo.truc"})).await; diff --git a/crates/meilisearch/tests/search/facet_search.rs b/crates/meilisearch/tests/search/facet_search.rs index 57d2cfcd2..da713fc22 100644 --- a/crates/meilisearch/tests/search/facet_search.rs +++ b/crates/meilisearch/tests/search/facet_search.rs @@ -50,11 +50,11 @@ async fn test_settings_documents_indexing_swapping_and_facet_search( let (task, code) = index.add_documents(documents.clone(), None).await; assert_eq!(code, 202, "{}", task); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (task, code) = index.update_settings(settings.clone()).await; assert_eq!(code, 202, "{}", task); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(query.clone()).await; insta::allow_duplicates! { @@ -70,11 +70,11 @@ async fn test_settings_documents_indexing_swapping_and_facet_search( let (task, code) = index.update_settings(settings.clone()).await; assert_eq!(code, 202, "{}", task); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (task, code) = index.add_documents(documents.clone(), None).await; assert_eq!(code, 202, "{}", task); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(query.clone()).await; insta::allow_duplicates! { @@ -94,7 +94,7 @@ async fn simple_facet_search() { let documents = DOCUMENTS.clone(); index.update_settings_filterable_attributes(json!(["genres"])).await; let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "a"})).await; @@ -207,10 +207,10 @@ async fn simple_facet_search_on_movies() { let (response, code) = index.update_settings_filterable_attributes(json!(["genres", "color"])).await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, _code) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetQuery": "", "facetName": "genres", "q": "" })).await; @@ -228,7 +228,7 @@ async fn advanced_facet_search() { index.update_settings_filterable_attributes(json!(["genres"])).await; index.update_settings_typo_tolerance(json!({ "enabled": false })).await; let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "adventre"})).await; @@ -252,7 +252,7 @@ async fn more_advanced_facet_search() { index.update_settings_filterable_attributes(json!(["genres"])).await; index.update_settings_typo_tolerance(json!({ "disableOnWords": ["adventre"] })).await; let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "adventre"})).await; @@ -276,7 +276,7 @@ async fn simple_facet_search_with_max_values() { index.update_settings_faceting(json!({ "maxValuesPerFacet": 1 })).await; index.update_settings_filterable_attributes(json!(["genres"])).await; let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "a"})).await; @@ -298,7 +298,7 @@ async fn simple_facet_search_by_count_with_max_values() { .await; index.update_settings_filterable_attributes(json!(["genres"])).await; let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "a"})).await; @@ -314,7 +314,7 @@ async fn non_filterable_facet_search_error() { let documents = DOCUMENTS.clone(); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "a"})).await; @@ -333,7 +333,7 @@ async fn facet_search_dont_support_words() { let documents = DOCUMENTS.clone(); index.update_settings_filterable_attributes(json!(["genres"])).await; let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "words"})).await; @@ -351,7 +351,7 @@ async fn simple_facet_search_with_sort_by_count() { index.update_settings_faceting(json!({ "sortFacetValuesBy": { "*": "count" } })).await; index.update_settings_filterable_attributes(json!(["genres"])).await; let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "a"})).await; @@ -370,7 +370,7 @@ async fn add_documents_and_deactivate_facet_search() { let documents = DOCUMENTS.clone(); let (response, _code) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index .update_settings(json!({ "facetSearch": false, @@ -378,7 +378,7 @@ async fn add_documents_and_deactivate_facet_search() { })) .await; assert_eq!("202", code.as_str(), "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "a"})).await; @@ -406,10 +406,10 @@ async fn deactivate_facet_search_and_add_documents() { })) .await; assert_eq!("202", code.as_str(), "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let documents = DOCUMENTS.clone(); let (response, _code) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "a"})).await; @@ -437,10 +437,10 @@ async fn deactivate_facet_search_add_documents_and_activate_facet_search() { })) .await; assert_eq!("202", code.as_str(), "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let documents = DOCUMENTS.clone(); let (response, _code) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index .update_settings(json!({ @@ -448,7 +448,7 @@ async fn deactivate_facet_search_add_documents_and_activate_facet_search() { })) .await; assert_eq!("202", code.as_str(), "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "a"})).await; @@ -469,10 +469,10 @@ async fn deactivate_facet_search_add_documents_and_reset_facet_search() { })) .await; assert_eq!("202", code.as_str(), "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let documents = DOCUMENTS.clone(); let (response, _code) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index .update_settings(json!({ @@ -480,7 +480,7 @@ async fn deactivate_facet_search_add_documents_and_reset_facet_search() { })) .await; assert_eq!("202", code.as_str(), "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetName": "genres", "facetQuery": "a"})).await; @@ -920,13 +920,13 @@ async fn distinct_facet_search_on_movies() { let (response, code) = index.update_settings_filterable_attributes(json!(["genres", "color"])).await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.update_settings_distinct_attribute(json!("color")).await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, _code) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.facet_search(json!({"facetQuery": "blob", "facetName": "genres", "q": "" })).await; diff --git a/crates/meilisearch/tests/search/filters.rs b/crates/meilisearch/tests/search/filters.rs index 564cae5a5..ffa025f5c 100644 --- a/crates/meilisearch/tests/search/filters.rs +++ b/crates/meilisearch/tests/search/filters.rs @@ -90,7 +90,7 @@ async fn search_with_contains_filter() { let documents = DOCUMENTS.clone(); let (request, _code) = index.add_documents(documents, None).await; - index.wait_task(request.uid()).await.succeeded(); + server.wait_task(request.uid()).await.succeeded(); let (response, code) = index .search_post(json!({ @@ -257,7 +257,7 @@ async fn search_with_pattern_filter_settings_scenario_1() { let (task, code) = index.add_documents(NESTED_DOCUMENTS.clone(), None).await; assert_eq!(code, 202, "{task}"); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (task, code) = index .update_settings(json!({"filterableAttributes": [{ @@ -269,7 +269,7 @@ async fn search_with_pattern_filter_settings_scenario_1() { }]})) .await; assert_eq!(code, 202, "{task}"); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // Check if the Equality filter works index @@ -334,7 +334,7 @@ async fn search_with_pattern_filter_settings_scenario_1() { }]})) .await; assert_eq!(code, 202, "{task}"); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // Check if the Equality filter works index @@ -445,7 +445,7 @@ async fn search_with_pattern_filter_settings_scenario_1() { }]})) .await; assert_eq!(code, 202, "{task}"); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // Check if the Equality filter returns an error index @@ -544,7 +544,7 @@ async fn search_with_pattern_filter_settings_scenario_1() { }]})) .await; assert_eq!(code, 202, "{task}"); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // Check if the Equality filter works index diff --git a/crates/meilisearch/tests/search/formatted.rs b/crates/meilisearch/tests/search/formatted.rs index 2b9383034..43a59e823 100644 --- a/crates/meilisearch/tests/search/formatted.rs +++ b/crates/meilisearch/tests/search/formatted.rs @@ -26,7 +26,7 @@ async fn search_formatted_from_sdk() { { "id": 42, "title": "The Hitchhiker's Guide to the Galaxy" } ]); let (response, _) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await; + server.wait_task(response.uid()).await; index .search( @@ -65,7 +65,7 @@ async fn formatted_contain_wildcard() { let documents = NESTED_DOCUMENTS.clone(); let (response, _) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); index.search(json!({ "q": "pésti", "attributesToRetrieve": ["father", "mother"], "attributesToHighlight": ["father", "mother", "*"], "attributesToCrop": ["doggos"], "showMatchesPosition": true }), |response, code| @@ -398,7 +398,7 @@ async fn displayedattr_2_smol() { let documents = NESTED_DOCUMENTS.clone(); let (response, _) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); index .search(json!({ "attributesToRetrieve": ["father", "id"], "attributesToHighlight": ["mother"], "attributesToCrop": ["cattos"] }), @@ -596,7 +596,7 @@ async fn test_cjk_highlight() { { "id": 1, "title": "大卫到了扫罗那里" }, ]); let (response, _) = index.add_documents(documents, None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); index .search(json!({"q": "で", "attributesToHighlight": ["title"]}), |response, code| { diff --git a/crates/meilisearch/tests/search/hybrid.rs b/crates/meilisearch/tests/search/hybrid.rs index c6eb39a3a..be2a724b0 100644 --- a/crates/meilisearch/tests/search/hybrid.rs +++ b/crates/meilisearch/tests/search/hybrid.rs @@ -17,11 +17,11 @@ async fn index_with_documents_user_provided<'a>( "dimensions": 2}}} )) .await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.add_documents(documents.clone(), None).await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); index } @@ -37,11 +37,11 @@ async fn index_with_documents_hf<'a>(server: &'a Server, documents: &Val }}} )) .await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.add_documents(documents.clone(), None).await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); index } @@ -543,7 +543,7 @@ async fn distinct_is_applied() { let (response, code) = index.update_settings(json!({ "distinctAttribute": "distinct" } )).await; assert_eq!(202, code, "{:?}", response); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); // pure keyword let (response, code) = index @@ -633,7 +633,7 @@ async fn retrieve_vectors() { .update_settings(json!({ "displayedAttributes": ["id", "title", "desc", "_vectors"]} )) .await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index .search_post( @@ -683,7 +683,7 @@ async fn retrieve_vectors() { let (response, code) = index.update_settings(json!({ "displayedAttributes": ["id", "title", "desc"]} )).await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index .search_post( diff --git a/crates/meilisearch/tests/search/locales.rs b/crates/meilisearch/tests/search/locales.rs index f45554d41..96c7fc7f5 100644 --- a/crates/meilisearch/tests/search/locales.rs +++ b/crates/meilisearch/tests/search/locales.rs @@ -99,7 +99,7 @@ async fn simple_search() { ) .await; let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // english index @@ -215,7 +215,7 @@ async fn force_locales() { } "###); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // chinese detection index @@ -293,7 +293,7 @@ async fn force_locales_with_pattern() { } "###); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // chinese detection index @@ -369,7 +369,7 @@ async fn force_locales_with_pattern_nested() { } "###); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // chinese index @@ -444,7 +444,7 @@ async fn force_different_locales_with_pattern() { } "###); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // force chinese index @@ -522,7 +522,7 @@ async fn auto_infer_locales_at_search_with_attributes_to_search_on() { } "###); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // auto infer any language index @@ -596,7 +596,7 @@ async fn auto_infer_locales_at_search() { } "###); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -695,7 +695,7 @@ async fn force_different_locales_with_pattern_nested() { } "###); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // chinese index @@ -773,7 +773,7 @@ async fn settings_change() { let documents = NESTED_DOCUMENTS.clone(); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, _) = index .update_settings(json!({ "searchableAttributes": ["document_en", "document_ja", "document_zh"], @@ -792,7 +792,7 @@ async fn settings_change() { "enqueuedAt": "[date]" } "###); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); // chinese index @@ -855,7 +855,7 @@ async fn settings_change() { "enqueuedAt": "[date]" } "###); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); // chinese index @@ -910,7 +910,7 @@ async fn invalid_locales() { ) .await; let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.search_post(json!({"q": "Atta", "locales": ["invalid"]})).await; snapshot!(code, @"400 Bad Request"); @@ -1028,7 +1028,7 @@ async fn simple_facet_search() { } "###); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, _) = index .facet_search(json!({"facetName": "name_zh", "facetQuery": "進撃", "locales": ["cmn"]})) @@ -1090,7 +1090,7 @@ async fn facet_search_with_localized_attributes() { } "###); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, _) = index .facet_search(json!({"facetName": "name_zh", "facetQuery": "进击", "locales": ["cmn"]})) @@ -1159,7 +1159,7 @@ async fn swedish_search() { ] })) .await; - index.wait_task(_response.uid()).await.succeeded(); + server.wait_task(_response.uid()).await.succeeded(); // infer swedish index @@ -1280,7 +1280,7 @@ async fn german_search() { ] })) .await; - index.wait_task(_response.uid()).await.succeeded(); + server.wait_task(_response.uid()).await.succeeded(); // infer swedish index diff --git a/crates/meilisearch/tests/search/matching_strategy.rs b/crates/meilisearch/tests/search/matching_strategy.rs index ece320b2a..10b93be76 100644 --- a/crates/meilisearch/tests/search/matching_strategy.rs +++ b/crates/meilisearch/tests/search/matching_strategy.rs @@ -9,7 +9,7 @@ async fn index_with_documents<'a>(server: &'a Server, documents: &Value) let index = server.unique_index(); let (task, _status_code) = index.add_documents(documents.clone(), None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index } diff --git a/crates/meilisearch/tests/search/mod.rs b/crates/meilisearch/tests/search/mod.rs index f547ce281..3f70e1ba9 100644 --- a/crates/meilisearch/tests/search/mod.rs +++ b/crates/meilisearch/tests/search/mod.rs @@ -38,11 +38,11 @@ async fn test_settings_documents_indexing_swapping_and_search( let (task, code) = index.add_documents(documents.clone(), None).await; assert_eq!(code, 202, "{task}"); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (task, code) = index.update_settings(settings.clone()).await; assert_eq!(code, 202, "{task}"); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index.search(query.clone(), test.clone()).await; @@ -51,11 +51,11 @@ async fn test_settings_documents_indexing_swapping_and_search( let (task, code) = index.update_settings(settings.clone()).await; assert_eq!(code, 202, "{task}"); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (task, code) = index.add_documents(documents.clone(), None).await; assert_eq!(code, 202, "{task}"); - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index.search(query.clone(), test.clone()).await; } @@ -104,7 +104,7 @@ async fn bug_5547() { let server = Server::new_shared(); let index = server.unique_index(); let (response, _code) = index.create(None).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let mut documents = Vec::new(); for i in 0..65_535 { @@ -112,7 +112,7 @@ async fn bug_5547() { } let (response, _code) = index.add_documents(json!(documents), Some("id")).await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, code) = index.search_post(json!({"q": "title"})).await; assert_eq!(code, 200); snapshot!(response["hits"], @r###"[{"id":0,"title":"title0"},{"id":1,"title":"title1"},{"id":10,"title":"title10"},{"id":100,"title":"title100"},{"id":101,"title":"title101"},{"id":102,"title":"title102"},{"id":103,"title":"title103"},{"id":104,"title":"title104"},{"id":105,"title":"title105"},{"id":106,"title":"title106"},{"id":107,"title":"title107"},{"id":108,"title":"title108"},{"id":1000,"title":"title1000"},{"id":1001,"title":"title1001"},{"id":1002,"title":"title1002"},{"id":1003,"title":"title1003"},{"id":1004,"title":"title1004"},{"id":1005,"title":"title1005"},{"id":1006,"title":"title1006"},{"id":1007,"title":"title1007"}]"###); @@ -131,7 +131,7 @@ async fn search_with_stop_word() { let documents = DOCUMENTS.clone(); let (task, _code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // prefix search index @@ -196,7 +196,7 @@ async fn search_with_typo_settings() { let documents = DOCUMENTS.clone(); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search(json!({"q": "287947" }), |response, code| { @@ -228,7 +228,7 @@ async fn phrase_search_with_stop_word() { let documents = DOCUMENTS.clone(); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search(json!({"q": "how \"to\" train \"the" }), |response, code| { @@ -308,11 +308,11 @@ async fn negative_special_cases_search() { let documents = DOCUMENTS.clone(); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (task, _status_code) = index.update_settings(json!({"synonyms": { "escape": ["gläss"] }})).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // There is a synonym for escape -> glass but we don't want "escape", only the derivates: glass index @@ -338,7 +338,7 @@ async fn test_kanji_language_detection() { { "id": 2, "title": "הַשּׁוּעָל הַמָּהִיר (״הַחוּם״) לֹא יָכוֹל לִקְפֹּץ 9.94 מֶטְרִים, נָכוֹן? ברר, 1.5°C- בַּחוּץ!" } ]); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search(json!({"q": "東京"}), |response, code| { @@ -361,10 +361,10 @@ async fn test_thai_language() { { "id": 2, "title": "สบู่สมุนไพรฝางแดงผสมว่านหางจรเข้ 100 กรัม จำนวน 6 ก้อน" } ]); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (task, _status_code) = index.update_settings(json!({"rankingRules": ["exactness"]})).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search(json!({"q": "สบู"}), |response, code| { @@ -586,7 +586,7 @@ async fn displayed_attributes() { let documents = DOCUMENTS.clone(); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, code) = index.search_post(json!({ "attributesToRetrieve": ["title", "id"] })).await; @@ -601,7 +601,7 @@ async fn placeholder_search_is_hard_limited() { let documents: Vec<_> = (0..1200).map(|i| json!({ "id": i, "text": "I am unique!" })).collect(); let (task, _status_code) = index.add_documents(documents.into(), None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -630,7 +630,7 @@ async fn placeholder_search_is_hard_limited() { let (task, _status_code) = index.update_settings(json!({ "pagination": { "maxTotalHits": 10_000 } })).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -665,7 +665,7 @@ async fn search_is_hard_limited() { let documents: Vec<_> = (0..1200).map(|i| json!({ "id": i, "text": "I am unique!" })).collect(); let (task, _status_code) = index.add_documents(documents.into(), None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -696,7 +696,7 @@ async fn search_is_hard_limited() { let (task, _status_code) = index.update_settings(json!({ "pagination": { "maxTotalHits": 10_000 } })).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -735,7 +735,7 @@ async fn faceting_max_values_per_facet() { let documents: Vec<_> = (0..10_000).map(|id| json!({ "id": id, "number": id * 10 })).collect(); let (task, _status_code) = index.add_documents(json!(documents), None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -752,7 +752,7 @@ async fn faceting_max_values_per_facet() { let (task, _status_code) = index.update_settings(json!({ "faceting": { "maxValuesPerFacet": 10_000 } })).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -1033,7 +1033,7 @@ async fn test_degraded_score_details() { index.add_documents(json!(documents), None).await; // We can't really use anything else than 0ms here; otherwise, the test will get flaky. let (res, _code) = index.update_settings(json!({ "searchCutoffMs": 0 })).await; - index.wait_task(res.uid()).await.succeeded(); + server.wait_task(res.uid()).await.succeeded(); index .search( @@ -1126,7 +1126,7 @@ async fn camelcased_words() { { "id": 4, "title": "testab" }, ]); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search(json!({"q": "deLonghi"}), |response, code| { @@ -1345,12 +1345,12 @@ async fn simple_search_with_strange_synonyms() { let (task, _status_code) = index.update_settings(json!({ "synonyms": {"&": ["to"], "to": ["&"]} })).await; - let r = index.wait_task(task.uid()).await.succeeded(); + let r = server.wait_task(task.uid()).await.succeeded(); snapshot!(r["status"], @r###""succeeded""###); let documents = DOCUMENTS.clone(); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search(json!({"q": "How to train"}), |response, code| { @@ -1416,11 +1416,11 @@ async fn change_attributes_settings() { let documents = NESTED_DOCUMENTS.clone(); let (task, _status_code) = index.add_documents(json!(documents), None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (task,_status_code) = index.update_settings(json!({ "searchableAttributes": ["father", "mother", "doggos"], "filterableAttributes": ["doggos"] })).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // search index @@ -1923,7 +1923,7 @@ async fn change_facet_casing() { })) .await; assert_eq!("202", code.as_str(), "{:?}", response); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, _code) = index .add_documents( @@ -1936,7 +1936,7 @@ async fn change_facet_casing() { None, ) .await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (response, _code) = index .add_documents( @@ -1949,7 +1949,7 @@ async fn change_facet_casing() { None, ) .await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); index .search(json!({ "facets": ["dog"] }), |response, code| { @@ -2062,7 +2062,7 @@ async fn simple_search_changing_unrelated_settings() { let documents = DOCUMENTS.clone(); let (task, _status_code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search(json!({"q": "Dragon"}), |response, code| { @@ -2084,7 +2084,7 @@ async fn simple_search_changing_unrelated_settings() { let (task, _status_code) = index.update_settings(json!({ "filterableAttributes": ["title"] })).await; - let r = index.wait_task(task.uid()).await.succeeded(); + let r = server.wait_task(task.uid()).await.succeeded(); snapshot!(r["status"], @r###""succeeded""###); index @@ -2106,7 +2106,7 @@ async fn simple_search_changing_unrelated_settings() { .await; let (task, _status_code) = index.update_settings(json!({ "filterableAttributes": [] })).await; - let r = index.wait_task(task.uid()).await.succeeded(); + let r = server.wait_task(task.uid()).await.succeeded(); snapshot!(r["status"], @r###""succeeded""###); index diff --git a/crates/meilisearch/tests/search/multi/mod.rs b/crates/meilisearch/tests/search/multi/mod.rs index cf98baa10..b9eed56da 100644 --- a/crates/meilisearch/tests/search/multi/mod.rs +++ b/crates/meilisearch/tests/search/multi/mod.rs @@ -21,7 +21,7 @@ pub async fn shared_movies_index() -> &'static Index<'static, Shared> { let documents = DOCUMENTS.clone(); let (response, _code) = movies_index.add_documents(documents, None).await; - movies_index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (value, _) = movies_index .update_settings(json!({ @@ -37,7 +37,7 @@ pub async fn shared_movies_index() -> &'static Index<'static, Shared> { ] })) .await; - movies_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); movies_index.to_shared() }) .await @@ -52,7 +52,7 @@ pub async fn shared_batman_index() -> &'static Index<'static, Shared> { let documents = SCORE_DOCUMENTS.clone(); let (response, _code) = batman_index.add_documents(documents, None).await; - batman_index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); let (value, _) = batman_index .update_settings(json!({ @@ -68,7 +68,7 @@ pub async fn shared_batman_index() -> &'static Index<'static, Shared> { ] })) .await; - batman_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); batman_index.to_shared() }) .await @@ -1085,14 +1085,14 @@ async fn federation_filter() { let documents = FRUITS_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = index .update_settings( json!({"searchableAttributes": ["name"], "filterableAttributes": ["BOOST"]}), ) .await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (response, code) = server .multi_search(json!({"federation": {}, "queries": [ @@ -1152,7 +1152,7 @@ async fn federation_sort_same_indexes_same_criterion_same_direction() { let documents = NESTED_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = index .update_settings(json!({ @@ -1167,7 +1167,7 @@ async fn federation_sort_same_indexes_same_criterion_same_direction() { ] })) .await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // two identical placeholder searches should have all results from the first query let (response, code) = server @@ -1365,7 +1365,7 @@ async fn federation_sort_same_indexes_same_criterion_opposite_direction() { let documents = NESTED_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = index .update_settings(json!({ @@ -1380,7 +1380,7 @@ async fn federation_sort_same_indexes_same_criterion_opposite_direction() { ] })) .await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // two identical placeholder searches should have all results from the first query let (response, code) = server @@ -1424,7 +1424,7 @@ async fn federation_sort_same_indexes_different_criterion_same_direction() { let documents = NESTED_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = index .update_settings(json!({ @@ -1439,7 +1439,7 @@ async fn federation_sort_same_indexes_different_criterion_same_direction() { ] })) .await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // return mothers and fathers ordered across fields. let (response, code) = server @@ -1638,7 +1638,7 @@ async fn federation_sort_same_indexes_different_criterion_opposite_direction() { let documents = NESTED_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = index .update_settings(json!({ @@ -1653,7 +1653,7 @@ async fn federation_sort_same_indexes_different_criterion_opposite_direction() { ] })) .await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // two identical placeholder searches should have all results from the first query let (response, code) = server @@ -3048,14 +3048,14 @@ async fn federation_invalid_weight() { let documents = FRUITS_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = index .update_settings( json!({"searchableAttributes": ["name"], "filterableAttributes": ["BOOST"]}), ) .await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (response, code) = server .multi_search(json!({"federation": {}, "queries": [ @@ -3082,14 +3082,14 @@ async fn federation_null_weight() { let documents = FRUITS_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = index .update_settings( json!({"searchableAttributes": ["name"], "filterableAttributes": ["BOOST"]}), ) .await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (response, code) = server .multi_search(json!({"federation": {}, "queries": [ @@ -3150,7 +3150,7 @@ async fn federation_federated_contains_pagination() { let documents = FRUITS_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // fail when a federated query contains "limit" let (response, code) = server @@ -3230,11 +3230,11 @@ async fn federation_federated_contains_facets() { ) .await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let documents = FRUITS_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // empty facets are actually OK let (response, code) = server @@ -3314,7 +3314,7 @@ async fn federation_non_faceted_for_an_index() { ) .await; - fruits_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let fruits_no_name_index = server.unique_index_with_prefix("fruits-no-name"); @@ -3324,18 +3324,18 @@ async fn federation_non_faceted_for_an_index() { ) .await; - fruits_no_name_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let fruits_no_facets_index = server.unique_index_with_prefix("fruits-no-facets"); let (value, _) = fruits_no_facets_index.update_settings(json!({"searchableAttributes": ["name"]})).await; - fruits_no_facets_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let documents = FRUITS_DOCUMENTS.clone(); let (value, _) = fruits_no_facets_index.add_documents(documents, None).await; - fruits_no_facets_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // fails let (response, code) = server @@ -3435,7 +3435,7 @@ async fn federation_non_federated_contains_federation_option() { let documents = FRUITS_DOCUMENTS.clone(); let (value, _) = index.add_documents(documents, None).await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // fail when a non-federated query contains "federationOptions" let (response, code) = server @@ -3473,12 +3473,12 @@ async fn federation_vector_single_index() { } }})) .await; - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let documents = VECTOR_DOCUMENTS.clone(); let (value, code) = index.add_documents(documents, None).await; snapshot!(code, @"202 Accepted"); - index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // same embedder let (response, code) = server @@ -3670,12 +3670,12 @@ async fn federation_vector_two_indexes() { }, }})) .await; - vectors_animal_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let documents = VECTOR_DOCUMENTS.clone(); let (value, code) = vectors_animal_index.add_documents(documents, None).await; snapshot!(code, @"202 Accepted"); - vectors_animal_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let vectors_sentiment_index = server.unique_index_with_prefix("vectors-sentiment"); @@ -3687,12 +3687,12 @@ async fn federation_vector_two_indexes() { } }})) .await; - vectors_sentiment_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let documents = VECTOR_DOCUMENTS.clone(); let (value, code) = vectors_sentiment_index.add_documents(documents, None).await; snapshot!(code, @"202 Accepted"); - vectors_sentiment_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (response, code) = server .multi_search(json!({"federation": {}, "queries": [ @@ -4154,7 +4154,7 @@ async fn federation_facets_different_indexes_same_facet() { let documents = SCORE_DOCUMENTS.clone(); let (value, _) = batman_2_index.add_documents(documents, None).await; - batman_2_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = batman_2_index .update_settings(json!({ @@ -4170,7 +4170,7 @@ async fn federation_facets_different_indexes_same_facet() { ] })) .await; - batman_2_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); // return titles ordered across indexes let (response, code) = server @@ -4677,7 +4677,7 @@ async fn federation_facets_same_indexes() { let documents = NESTED_DOCUMENTS.clone(); let (value, _) = doggos_index.add_documents(documents, None).await; - doggos_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = doggos_index .update_settings(json!({ @@ -4692,13 +4692,13 @@ async fn federation_facets_same_indexes() { ] })) .await; - doggos_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let doggos2_index = server.unique_index_with_prefix("doggos_2"); let documents = NESTED_DOCUMENTS.clone(); let (value, _) = doggos2_index.add_documents(documents, None).await; - doggos2_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = doggos2_index .update_settings(json!({ @@ -4713,7 +4713,7 @@ async fn federation_facets_same_indexes() { ] })) .await; - doggos2_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (response, code) = server .multi_search(json!({"federation": { @@ -4980,7 +4980,7 @@ async fn federation_inconsistent_merge_order() { let documents = DOCUMENTS.clone(); let (value, _) = movies2_index.add_documents(documents, None).await; - movies2_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let (value, _) = movies2_index .update_settings(json!({ @@ -4999,7 +4999,7 @@ async fn federation_inconsistent_merge_order() { } })) .await; - movies2_index.wait_task(value.uid()).await.succeeded(); + server.wait_task(value.uid()).await.succeeded(); let batman_index = shared_batman_index().await; diff --git a/crates/meilisearch/tests/search/pagination.rs b/crates/meilisearch/tests/search/pagination.rs index f8b698a95..c0752e7ec 100644 --- a/crates/meilisearch/tests/search/pagination.rs +++ b/crates/meilisearch/tests/search/pagination.rs @@ -114,14 +114,14 @@ async fn ensure_placeholder_search_hit_count_valid() { } ]); let (task, _code) = index.add_documents(documents, None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); let (response, _code) = index .update_settings( json!({ "rankingRules": ["distinct:asc"], "distinctAttribute": "distinct"}), ) .await; - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); for page in 0..=4 { index diff --git a/crates/meilisearch/tests/search/restrict_searchable.rs b/crates/meilisearch/tests/search/restrict_searchable.rs index e5408a210..bbd2a4ee3 100644 --- a/crates/meilisearch/tests/search/restrict_searchable.rs +++ b/crates/meilisearch/tests/search/restrict_searchable.rs @@ -9,7 +9,7 @@ async fn index_with_documents<'a>(server: &'a Server, documents: &Value) let index = server.unique_index(); let (task, _code) = index.add_documents(documents.clone(), None).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index } @@ -65,7 +65,7 @@ async fn search_no_searchable_attribute_set() { .await; let (task, _status_code) = index.update_settings_searchable_attributes(json!(["*"])).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -78,7 +78,7 @@ async fn search_no_searchable_attribute_set() { .await; let (task, _status_code) = index.update_settings_searchable_attributes(json!(["*"])).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -109,7 +109,7 @@ async fn search_on_all_attributes_restricted_set() { let server = Server::new_shared(); let index = index_with_documents(server, &SIMPLE_SEARCH_DOCUMENTS).await; let (task, _status_code) = index.update_settings_searchable_attributes(json!(["title"])).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search(json!({"q": "Captain Marvel", "attributesToSearchOn": ["*"]}), |response, code| { @@ -194,7 +194,7 @@ async fn word_ranking_rule_order_exact_words() { let (task, _status_code) = index .update_settings_typo_tolerance(json!({"disableOnWords": ["Captain", "Marvel"]})) .await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); // simple search should return 2 documents (ids: 2 and 3). index @@ -360,7 +360,7 @@ async fn search_on_exact_field() { let (response, code) = index.update_settings_typo_tolerance(json!({ "disableOnAttributes": ["exact"] })).await; assert_eq!(202, code, "{response:?}"); - index.wait_task(response.uid()).await.succeeded(); + server.wait_task(response.uid()).await.succeeded(); // Searching on an exact attribute should only return the document matching without typo. index .search(json!({"q": "Marvel", "attributesToSearchOn": ["exact"]}), |response, code| { @@ -557,7 +557,7 @@ async fn nested_search_on_title_restricted_set_with_suffix_wildcard() { let index = index_with_documents(server, &NESTED_SEARCH_DOCUMENTS).await; let (task, _status_code) = index.update_settings_searchable_attributes(json!(["details.title"])).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -595,7 +595,7 @@ async fn nested_search_no_searchable_attribute_set_with_any_wildcard() { .await; let (task, _status_code) = index.update_settings_searchable_attributes(json!(["*"])).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search( @@ -608,7 +608,7 @@ async fn nested_search_no_searchable_attribute_set_with_any_wildcard() { .await; let (task, _status_code) = index.update_settings_searchable_attributes(json!(["*"])).await; - index.wait_task(task.uid()).await.succeeded(); + server.wait_task(task.uid()).await.succeeded(); index .search(