diff --git a/meilisearch/tests/search/formatted.rs b/meilisearch/tests/search/formatted.rs
index 8a40616a3..0f03362ee 100644
--- a/meilisearch/tests/search/formatted.rs
+++ b/meilisearch/tests/search/formatted.rs
@@ -1,3 +1,4 @@
+use insta::{allow_duplicates, assert_json_snapshot};
use serde_json::json;
use super::*;
@@ -18,30 +19,45 @@ async fn formatted_contain_wildcard() {
|response, code|
{
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "_formatted": {
- "id": "852",
- "cattos": "pésti",
- },
- "_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
- })
- );
- }
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "_formatted": {
+ "id": "852",
+ "cattos": "pésti"
+ },
+ "_matchesPosition": {
+ "cattos": [
+ {
+ "start": 0,
+ "length": 5
+ }
+ ]
+ },
+ "_rankingScore": "[score]"
+ }
+ "###);
+ }
+ }
)
.await;
index
.search(json!({ "q": "pésti", "attributesToRetrieve": ["*"] }), |response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- "cattos": "pésti",
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "cattos": "pésti",
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
@@ -50,20 +66,30 @@ async fn formatted_contain_wildcard() {
json!({ "q": "pésti", "attributesToRetrieve": ["*"], "attributesToHighlight": ["id"], "showMatchesPosition": true }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- "cattos": "pésti",
- "_formatted": {
- "id": "852",
- "cattos": "pésti",
- },
- "_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
- })
- );
- }
- )
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "cattos": "pésti",
+ "_formatted": {
+ "id": "852",
+ "cattos": "pésti"
+ },
+ "_matchesPosition": {
+ "cattos": [
+ {
+ "start": 0,
+ "length": 5
+ }
+ ]
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
+ })
.await;
index
@@ -71,17 +97,21 @@ async fn formatted_contain_wildcard() {
json!({ "q": "pésti", "attributesToRetrieve": ["*"], "attributesToCrop": ["*"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- "cattos": "pésti",
- "_formatted": {
- "id": "852",
- "cattos": "pésti",
- }
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "cattos": "pésti",
+ "_formatted": {
+ "id": "852",
+ "cattos": "pésti"
+ },
+ "_rankingScore": "[score]"
+ }
+ "###);
+ }
},
)
.await;
@@ -89,17 +119,21 @@ async fn formatted_contain_wildcard() {
index
.search(json!({ "q": "pésti", "attributesToCrop": ["*"] }), |response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- "cattos": "pésti",
- "_formatted": {
- "id": "852",
- "cattos": "pésti",
- }
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "cattos": "pésti",
+ "_formatted": {
+ "id": "852",
+ "cattos": "pésti"
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
}
@@ -116,21 +150,25 @@ async fn format_nested() {
index
.search(json!({ "q": "pésti", "attributesToRetrieve": ["doggos"] }), |response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "doggos": [
- {
- "name": "bobby",
- "age": 2,
- },
- {
- "name": "buddy",
- "age": 4,
- },
- ],
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "doggos": [
+ {
+ "name": "bobby",
+ "age": 2
+ },
+ {
+ "name": "buddy",
+ "age": 4
+ }
+ ],
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
@@ -139,19 +177,23 @@ async fn format_nested() {
json!({ "q": "pésti", "attributesToRetrieve": ["doggos.name"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "doggos": [
- {
- "name": "bobby",
- },
- {
- "name": "buddy",
- },
- ],
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "doggos": [
+ {
+ "name": "bobby"
+ },
+ {
+ "name": "buddy"
+ }
+ ],
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
},
)
.await;
@@ -161,20 +203,31 @@ async fn format_nested() {
json!({ "q": "bobby", "attributesToRetrieve": ["doggos.name"], "showMatchesPosition": true }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "doggos": [
- {
- "name": "bobby",
- },
- {
- "name": "buddy",
- },
- ],
- "_matchesPosition": {"doggos.name": [{"start": 0, "length": 5}]},
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "doggos": [
+ {
+ "name": "bobby"
+ },
+ {
+ "name": "buddy"
+ }
+ ],
+ "_matchesPosition": {
+ "doggos.name": [
+ {
+ "start": 0,
+ "length": 5
+ }
+ ]
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
}
)
.await;
@@ -183,21 +236,25 @@ async fn format_nested() {
.search(json!({ "q": "pésti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.name"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "_formatted": {
- "doggos": [
- {
- "name": "bobby",
- },
- {
- "name": "buddy",
- },
- ],
- },
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "_formatted": {
+ "doggos": [
+ {
+ "name": "bobby"
+ },
+ {
+ "name": "buddy"
+ }
+ ]
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
@@ -205,21 +262,25 @@ async fn format_nested() {
.search(json!({ "q": "pésti", "attributesToRetrieve": [], "attributesToCrop": ["doggos.name"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "_formatted": {
- "doggos": [
- {
- "name": "bobby",
- },
- {
- "name": "buddy",
- },
- ],
- },
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "_formatted": {
+ "doggos": [
+ {
+ "name": "bobby"
+ },
+ {
+ "name": "buddy"
+ }
+ ]
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
@@ -227,55 +288,63 @@ async fn format_nested() {
.search(json!({ "q": "pésti", "attributesToRetrieve": ["doggos.name"], "attributesToHighlight": ["doggos.age"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "doggos": [
- {
- "name": "bobby",
- },
- {
- "name": "buddy",
- },
- ],
- "_formatted": {
- "doggos": [
- {
- "name": "bobby",
- "age": "2",
- },
- {
- "name": "buddy",
- "age": "4",
- },
- ],
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "doggos": [
+ {
+ "name": "bobby"
},
- })
- );
- })
+ {
+ "name": "buddy"
+ }
+ ],
+ "_formatted": {
+ "doggos": [
+ {
+ "name": "bobby",
+ "age": "2"
+ },
+ {
+ "name": "buddy",
+ "age": "4"
+ }
+ ]
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
+ })
.await;
index
.search(json!({ "q": "pésti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.age"], "attributesToCrop": ["doggos.name"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "_formatted": {
- "doggos": [
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
{
- "name": "bobby",
- "age": "2",
- },
- {
- "name": "buddy",
- "age": "4",
- },
- ],
- },
- })
- );
+ "_formatted": {
+ "doggos": [
+ {
+ "name": "bobby",
+ "age": "2"
+ },
+ {
+ "name": "buddy",
+ "age": "4"
+ }
+ ]
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
}
)
.await;
@@ -297,54 +366,70 @@ async fn displayedattr_2_smol() {
.search(json!({ "attributesToRetrieve": ["father", "id"], "attributesToHighlight": ["mother"], "attributesToCrop": ["cattos"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
index
.search(json!({ "attributesToRetrieve": ["id"] }), |response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
index
.search(json!({ "attributesToHighlight": ["id"] }), |response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- "_formatted": {
- "id": "852",
- }
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "_formatted": {
+ "id": "852"
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
index
.search(json!({ "attributesToCrop": ["id"] }), |response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- "_formatted": {
- "id": "852",
- }
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "_formatted": {
+ "id": "852"
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
@@ -353,15 +438,19 @@ async fn displayedattr_2_smol() {
json!({ "attributesToHighlight": ["id"], "attributesToCrop": ["id"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- "_formatted": {
- "id": "852",
- }
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "_formatted": {
+ "id": "852"
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
},
)
.await;
@@ -369,31 +458,47 @@ async fn displayedattr_2_smol() {
index
.search(json!({ "attributesToHighlight": ["cattos"] }), |response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
index
.search(json!({ "attributesToCrop": ["cattos"] }), |response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "id": 852,
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "id": 852,
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
index
.search(json!({ "attributesToRetrieve": ["cattos"] }), |response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(response["hits"][0], json!({}));
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
})
.await;
@@ -402,7 +507,15 @@ async fn displayedattr_2_smol() {
json!({ "attributesToRetrieve": ["cattos"], "attributesToHighlight": ["cattos"], "attributesToCrop": ["cattos"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(response["hits"][0], json!({}));
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
}
)
@@ -413,14 +526,18 @@ async fn displayedattr_2_smol() {
json!({ "attributesToRetrieve": ["cattos"], "attributesToHighlight": ["id"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "_formatted": {
- "id": "852",
- }
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "_formatted": {
+ "id": "852"
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
},
)
.await;
@@ -430,14 +547,18 @@ async fn displayedattr_2_smol() {
json!({ "attributesToRetrieve": ["cattos"], "attributesToCrop": ["id"] }),
|response, code| {
assert_eq!(code, 200, "{}", response);
- assert_eq!(
- response["hits"][0],
- json!({
- "_formatted": {
- "id": "852",
- }
- })
- );
+ allow_duplicates! {
+ assert_json_snapshot!(response["hits"][0],
+ { "._rankingScore" => "[score]" },
+ @r###"
+ {
+ "_formatted": {
+ "id": "852"
+ },
+ "_rankingScore": "[score]"
+ }
+ "###)
+ }
},
)
.await;
diff --git a/meilisearch/tests/search/multi.rs b/meilisearch/tests/search/multi.rs
index b00ddf3de..bd9f9fd9f 100644
--- a/meilisearch/tests/search/multi.rs
+++ b/meilisearch/tests/search/multi.rs
@@ -65,14 +65,15 @@ async fn simple_search_single_index() {
]}))
.await;
snapshot!(code, @"200 OK");
- insta::assert_json_snapshot!(response["results"], { "[].processingTimeMs" => "[time]" }, @r###"
+ insta::assert_json_snapshot!(response["results"], { "[].processingTimeMs" => "[time]", ".**._rankingScore" => "[score]" }, @r###"
[
{
"indexUid": "test",
"hits": [
{
"title": "Gläss",
- "id": "450465"
+ "id": "450465",
+ "_rankingScore": "[score]"
}
],
"query": "glass",
@@ -86,7 +87,8 @@ async fn simple_search_single_index() {
"hits": [
{
"title": "Captain Marvel",
- "id": "299537"
+ "id": "299537",
+ "_rankingScore": "[score]"
}
],
"query": "captain",
@@ -170,14 +172,15 @@ async fn simple_search_two_indexes() {
]}))
.await;
snapshot!(code, @"200 OK");
- insta::assert_json_snapshot!(response["results"], { "[].processingTimeMs" => "[time]" }, @r###"
+ insta::assert_json_snapshot!(response["results"], { "[].processingTimeMs" => "[time]", ".**._rankingScore" => "[score]" }, @r###"
[
{
"indexUid": "test",
"hits": [
{
"title": "Gläss",
- "id": "450465"
+ "id": "450465",
+ "_rankingScore": "[score]"
}
],
"query": "glass",
@@ -203,7 +206,8 @@ async fn simple_search_two_indexes() {
"age": 4
}
],
- "cattos": "pésti"
+ "cattos": "pésti",
+ "_rankingScore": "[score]"
},
{
"id": 654,
@@ -218,7 +222,8 @@ async fn simple_search_two_indexes() {
"cattos": [
"simba",
"pestiféré"
- ]
+ ],
+ "_rankingScore": "[score]"
}
],
"query": "pésti",