searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-26 14:54:27 +01:00
Code Issues Releases Wiki Activity

Introduce a canceledBy filter for the tests

Browse Source
This commit is contained in:
Kerollmops 2023-01-18 15:50:05 +01:00
parent 7322f4e78e
commit 182eea1f17
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meilisearch/tests/common/index.rs
View File

@ -132,7 +132,12 @@ impl Index<'_> {
self.service.get(url).await self.service.get(url).await
} }
pub async fn filtered_tasks(&self, types: &[&str], statuses: &[&str]) -> (Value, StatusCode) { pub async fn filtered_tasks(
&self,
types: &[&str],
statuses: &[&str],
canceled_by: &[&str],
) -> (Value, StatusCode) {
let mut url = format!("/tasks?indexUids={}", self.uid); let mut url = format!("/tasks?indexUids={}", self.uid);
if !types.is_empty() { if !types.is_empty() {
let _ = write!(url, "&types={}", types.join(",")); let _ = write!(url, "&types={}", types.join(","));
@ -140,6 +145,9 @@ impl Index<'_> {
if !statuses.is_empty() { if !statuses.is_empty() {
let _ = write!(url, "&statuses={}", statuses.join(",")); let _ = write!(url, "&statuses={}", statuses.join(","));
} }
if !canceled_by.is_empty() {
let _ = write!(url, "&canceledBy={}", canceled_by.join(","));
}
self.service.get(url).await self.service.get(url).await
} }

2
meilisearch/tests/documents/add_documents.rs
View File

@ -1077,7 +1077,7 @@ async fn batch_several_documents_addition() {
futures::future::join_all(waiter).await; futures::future::join_all(waiter).await;
index.wait_task(9).await; index.wait_task(9).await;
let (response, _code) = index.filtered_tasks(&[], &["failed"]).await; let (response, _code) = index.filtered_tasks(&[], &["failed"], &[]).await;
// Check if only the 6th task failed // Check if only the 6th task failed
println!("{}", &response); println!("{}", &response);

11
meilisearch/tests/tasks/mod.rs
View File

@ -115,7 +115,7 @@ async fn list_tasks_status_filtered() {
.add_documents(serde_json::from_str(include_str!("../assets/test_set.json")).unwrap(), None) .add_documents(serde_json::from_str(include_str!("../assets/test_set.json")).unwrap(), None)
.await; .await;
let (response, code) = index.filtered_tasks(&[], &["succeeded"]).await; let (response, code) = index.filtered_tasks(&[], &["succeeded"], &[]).await;
assert_eq!(code, 200, "{}", response); assert_eq!(code, 200, "{}", response);
assert_eq!(response["results"].as_array().unwrap().len(), 1); assert_eq!(response["results"].as_array().unwrap().len(), 1);
@ -126,7 +126,7 @@ async fn list_tasks_status_filtered() {
index.wait_task(1).await; index.wait_task(1).await;
let (response, code) = index.filtered_tasks(&[], &["succeeded"]).await; let (response, code) = index.filtered_tasks(&[], &["succeeded"], &[]).await;
assert_eq!(code, 200, "{}", response); assert_eq!(code, 200, "{}", response);
assert_eq!(response["results"].as_array().unwrap().len(), 2); assert_eq!(response["results"].as_array().unwrap().len(), 2);
} }
@ -141,12 +141,12 @@ async fn list_tasks_type_filtered() {
.add_documents(serde_json::from_str(include_str!("../assets/test_set.json")).unwrap(), None) .add_documents(serde_json::from_str(include_str!("../assets/test_set.json")).unwrap(), None)
.await; .await;
let (response, code) = index.filtered_tasks(&["indexCreation"], &[]).await; let (response, code) = index.filtered_tasks(&["indexCreation"], &[], &[]).await;
assert_eq!(code, 200, "{}", response); assert_eq!(code, 200, "{}", response);
assert_eq!(response["results"].as_array().unwrap().len(), 1); assert_eq!(response["results"].as_array().unwrap().len(), 1);
let (response, code) = let (response, code) =
index.filtered_tasks(&["indexCreation", "documentAdditionOrUpdate"], &[]).await; index.filtered_tasks(&["indexCreation", "documentAdditionOrUpdate"], &[], &[]).await;
assert_eq!(code, 200, "{}", response); assert_eq!(code, 200, "{}", response);
assert_eq!(response["results"].as_array().unwrap().len(), 2); assert_eq!(response["results"].as_array().unwrap().len(), 2);
} }
@ -161,7 +161,7 @@ async fn list_tasks_status_and_type_filtered() {
.add_documents(serde_json::from_str(include_str!("../assets/test_set.json")).unwrap(), None) .add_documents(serde_json::from_str(include_str!("../assets/test_set.json")).unwrap(), None)
.await; .await;
let (response, code) = index.filtered_tasks(&["indexCreation"], &["failed"]).await; let (response, code) = index.filtered_tasks(&["indexCreation"], &["failed"], &[]).await;
assert_eq!(code, 200, "{}", response); assert_eq!(code, 200, "{}", response);
assert_eq!(response["results"].as_array().unwrap().len(), 0); assert_eq!(response["results"].as_array().unwrap().len(), 0);
@ -169,6 +169,7 @@ async fn list_tasks_status_and_type_filtered() {
.filtered_tasks( .filtered_tasks(
&["indexCreation", "documentAdditionOrUpdate"], &["indexCreation", "documentAdditionOrUpdate"],
&["succeeded", "processing", "enqueued"], &["succeeded", "processing", "enqueued"],
&[],
) )
.await; .await;
assert_eq!(code, 200, "{}", response); assert_eq!(code, 200, "{}", response);