searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 11:57:07 +02:00
Code Issues Releases Wiki Activity

#4840 - Partial fix - Remove hard coded task ids to prevent flaky tests.

Browse source 
# Conflicts:
#	crates/meilisearch/tests/documents/add_documents.rs
#	crates/meilisearch/tests/search/facet_search.rs
#	crates/meilisearch/tests/settings/get_settings.rs
#	crates/meilisearch/tests/snapshot/mod.rs
This commit is contained in:
Mahmoud Rawas 2024-12-21 21:46:51 +11:00
parent fc23a0ee52
commit 91c7ef8723
24 changed files with 555 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/meilisearch/tests/auth/tenant_token.rs
View file

@ -99,12 +99,12 @@ macro_rules! compute_authorized_search {
server.use_admin_key("MASTER_KEY").await;
let index = server.index("sales");
let documents = DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(0).await;
index
let (task1,_status_code) = index.add_documents(documents, None).await;
index.wait_task(task1.uid()).await;
let (task2,_status_code) = index
.update_settings(json!({"filterableAttributes": ["color"]}))
.await;
index.wait_task(1).await;
index.wait_task(task2.uid()).await;
drop(index);
for key_content in ACCEPTED_KEYS.iter() {
@ -146,8 +146,8 @@ macro_rules! compute_forbidden_search {
server.use_admin_key("MASTER_KEY").await;
let index = server.index("sales");
let documents = DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(0).await;
let (task,_status_code) = index.add_documents(documents, None).await;
index.wait_task(task.uid()).await;
drop(index);
for key_content in $parent_keys.iter() {

64
crates/meilisearch/tests/auth/tenant_token_multi_search.rs
View file

@ -267,22 +267,22 @@ macro_rules! compute_authorized_single_search {
server.use_admin_key("MASTER_KEY").await;
let index = server.index("sales");
let documents = DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(0).await;
index
let (add_task,_status_code) = index.add_documents(documents, None).await;
index.wait_task(add_task.uid()).await;
let (update_task,_status_code) = index
.update_settings(json!({"filterableAttributes": ["color"]}))
.await;
index.wait_task(1).await;
index.wait_task(update_task.uid()).await;
drop(index);
let index = server.index("products");
let documents = NESTED_DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(2).await;
index
let (add_task2,_status_code) = index.add_documents(documents, None).await;
index.wait_task(add_task2.uid()).await;
let (update_task2,_status_code) = index
.update_settings(json!({"filterableAttributes": ["doggos"]}))
.await;
index.wait_task(3).await;
index.wait_task(update_task2.uid()).await;
drop(index);
@ -338,22 +338,22 @@ macro_rules! compute_authorized_multiple_search {
server.use_admin_key("MASTER_KEY").await;
let index = server.index("sales");
let documents = DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(0).await;
index
let (task,_status_code) = index.add_documents(documents, None).await;
index.wait_task(task.uid()).await;
let (task,_status_code) = index
.update_settings(json!({"filterableAttributes": ["color"]}))
.await;
index.wait_task(1).await;
index.wait_task(task.uid()).await;
drop(index);
let index = server.index("products");
let documents = NESTED_DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(2).await;
index
let (task,_status_code) = index.add_documents(documents, None).await;
index.wait_task(task.uid()).await;
let (task,_status_code) = index
.update_settings(json!({"filterableAttributes": ["doggos"]}))
.await;
index.wait_task(3).await;
index.wait_task(task.uid()).await;
drop(index);
@ -422,22 +422,22 @@ macro_rules! compute_forbidden_single_search {
server.use_admin_key("MASTER_KEY").await;
let index = server.index("sales");
let documents = DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(0).await;
index
let (task,_status_code) = index.add_documents(documents, None).await;
index.wait_task(task.uid()).await;
let (task,_status_code) = index
.update_settings(json!({"filterableAttributes": ["color"]}))
.await;
index.wait_task(1).await;
index.wait_task(task.uid()).await;
drop(index);
let index = server.index("products");
let documents = NESTED_DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(2).await;
index
let (task,_status_code) = index.add_documents(documents, None).await;
index.wait_task(task.uid()).await;
let (task,_status_code) = index
.update_settings(json!({"filterableAttributes": ["doggos"]}))
.await;
index.wait_task(3).await;
index.wait_task(task.uid()).await;
drop(index);
assert_eq!($parent_keys.len(), $failed_query_indexes.len(), "keys != query_indexes");
@ -498,22 +498,22 @@ macro_rules! compute_forbidden_multiple_search {
server.use_admin_key("MASTER_KEY").await;
let index = server.index("sales");
let documents = DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(0).await;
index
let (task,_status_code) = index.add_documents(documents, None).await;
index.wait_task(task.uid()).await;
let (task,_status_code) = index
.update_settings(json!({"filterableAttributes": ["color"]}))
.await;
index.wait_task(1).await;
index.wait_task(task.uid()).await;
drop(index);
let index = server.index("products");
let documents = NESTED_DOCUMENTS.clone();
index.add_documents(documents, None).await;
index.wait_task(2).await;
index
let (task,_status_code) = index.add_documents(documents, None).await;
index.wait_task(task.uid()).await;
let (task,_status_code) = index
.update_settings(json!({"filterableAttributes": ["doggos"]}))
.await;
index.wait_task(3).await;
index.wait_task(task.uid()).await;
drop(index);
assert_eq!($parent_keys.len(), $failed_query_indexes.len(), "keys != query_indexes");