diff --git a/crates/meilisearch/tests/common/index.rs b/crates/meilisearch/tests/common/index.rs index b8c1d2824..529fb0793 100644 --- a/crates/meilisearch/tests/common/index.rs +++ b/crates/meilisearch/tests/common/index.rs @@ -411,7 +411,7 @@ impl Index<'_, State> { self.service.get(url).await } - pub async fn get_document_by_filter(&self, payload: Value) -> (Value, StatusCode) { + pub async fn fetch_documents(&self, payload: Value) -> (Value, StatusCode) { let url = format!("/indexes/{}/documents/fetch", urlencode(self.uid.as_ref())); self.service.post(url, payload).await } diff --git a/crates/meilisearch/tests/documents/errors.rs b/crates/meilisearch/tests/documents/errors.rs index 7b2ca8b5e..51b6cdf4d 100644 --- a/crates/meilisearch/tests/documents/errors.rs +++ b/crates/meilisearch/tests/documents/errors.rs @@ -667,7 +667,7 @@ async fn fetch_document_by_filter() { .await; index.wait_task(task.uid()).await.succeeded(); - let (response, code) = index.get_document_by_filter(json!(null)).await; + let (response, code) = index.fetch_documents(json!(null)).await; snapshot!(code, @"400 Bad Request"); snapshot!(response, @r###" { @@ -678,7 +678,7 @@ async fn fetch_document_by_filter() { } "###); - let (response, code) = index.get_document_by_filter(json!({ "offset": "doggo" })).await; + let (response, code) = index.fetch_documents(json!({ "offset": "doggo" })).await; snapshot!(code, @"400 Bad Request"); snapshot!(response, @r###" { @@ -689,7 +689,7 @@ async fn fetch_document_by_filter() { } "###); - let (response, code) = index.get_document_by_filter(json!({ "limit": "doggo" })).await; + let (response, code) = index.fetch_documents(json!({ "limit": "doggo" })).await; snapshot!(code, @"400 Bad Request"); snapshot!(response, @r###" { @@ -700,7 +700,7 @@ async fn fetch_document_by_filter() { } "###); - let (response, code) = index.get_document_by_filter(json!({ "fields": "doggo" })).await; + let (response, code) = index.fetch_documents(json!({ "fields": "doggo" })).await; snapshot!(code, @"400 Bad Request"); snapshot!(response, @r###" { @@ -711,7 +711,7 @@ async fn fetch_document_by_filter() { } "###); - let (response, code) = index.get_document_by_filter(json!({ "filter": true })).await; + let (response, code) = index.fetch_documents(json!({ "filter": true })).await; snapshot!(code, @"400 Bad Request"); snapshot!(response, @r###" { @@ -722,7 +722,7 @@ async fn fetch_document_by_filter() { } "###); - let (response, code) = index.get_document_by_filter(json!({ "filter": "cool doggo" })).await; + let (response, code) = index.fetch_documents(json!({ "filter": "cool doggo" })).await; snapshot!(code, @"400 Bad Request"); snapshot!(response, @r###" { @@ -733,8 +733,7 @@ async fn fetch_document_by_filter() { } "###); - let (response, code) = - index.get_document_by_filter(json!({ "filter": "doggo = bernese" })).await; + let (response, code) = index.fetch_documents(json!({ "filter": "doggo = bernese" })).await; snapshot!(code, @"400 Bad Request"); snapshot!(response, @r###" { @@ -762,8 +761,7 @@ async fn retrieve_vectors() { "###); // FETCH ALL DOCUMENTS BY POST - let (response, _code) = - index.get_document_by_filter(json!({ "retrieveVectors": "tamo" })).await; + let (response, _code) = index.fetch_documents(json!({ "retrieveVectors": "tamo" })).await; snapshot!(response, @r###" { "message": "Invalid value type at `.retrieveVectors`: expected a boolean, but found a string: `\"tamo\"`", diff --git a/crates/meilisearch/tests/documents/get_documents.rs b/crates/meilisearch/tests/documents/get_documents.rs index 966fccefd..1394e5e8d 100644 --- a/crates/meilisearch/tests/documents/get_documents.rs +++ b/crates/meilisearch/tests/documents/get_documents.rs @@ -371,7 +371,7 @@ async fn get_document_by_filter() { .await; index.wait_task(task.uid()).await.succeeded(); - let (response, code) = index.get_document_by_filter(json!({})).await; + let (response, code) = index.fetch_documents(json!({})).await; let (response2, code2) = index.get_all_documents_raw("").await; snapshot!(code, @"200 OK"); snapshot!(json_string!(response, { ".enqueuedAt" => "[date]" }), @r###" @@ -401,7 +401,7 @@ async fn get_document_by_filter() { assert_eq!(code, code2); assert_eq!(response, response2); - let (response, code) = index.get_document_by_filter(json!({ "filter": "color = blue" })).await; + let (response, code) = index.fetch_documents(json!({ "filter": "color = blue" })).await; let (response2, code2) = index.get_all_documents_raw("?filter=color=blue").await; snapshot!(code, @"200 OK"); snapshot!(json_string!(response, { ".enqueuedAt" => "[date]" }), @r###" @@ -424,9 +424,8 @@ async fn get_document_by_filter() { assert_eq!(code, code2); assert_eq!(response, response2); - let (response, code) = index - .get_document_by_filter(json!({ "offset": 1, "limit": 1, "filter": "color != blue" })) - .await; + let (response, code) = + index.fetch_documents(json!({ "offset": 1, "limit": 1, "filter": "color != blue" })).await; let (response2, code2) = index.get_all_documents_raw("?filter=color!=blue&offset=1&limit=1").await; snapshot!(code, @"200 OK"); @@ -446,9 +445,7 @@ async fn get_document_by_filter() { assert_eq!(response, response2); let (response, code) = index - .get_document_by_filter( - json!({ "limit": 1, "filter": "color != blue", "fields": ["color"] }), - ) + .fetch_documents(json!({ "limit": 1, "filter": "color != blue", "fields": ["color"] })) .await; let (response2, code2) = index.get_all_documents_raw("?limit=1&filter=color!=blue&fields=color").await; @@ -471,7 +468,7 @@ async fn get_document_by_filter() { // Now testing more complex filter that the get route can't represent let (response, code) = - index.get_document_by_filter(json!({ "filter": [["color = blue", "color = red"]] })).await; + index.fetch_documents(json!({ "filter": [["color = blue", "color = red"]] })).await; snapshot!(code, @"200 OK"); snapshot!(json_string!(response, { ".enqueuedAt" => "[date]" }), @r###" {