snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 20:15:07 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix conflicts after rebase

Browse Source
This commit is contained in:
Tamo 2024-09-02 18:15:42 +02:00
parent 5aefe7cd17
commit fa1a0beb0c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meilisearch/tests/common/server.rs
View File

@ -204,7 +204,13 @@ impl Server<Shared> {
let options = default_settings(dir.path()); let options = default_settings(dir.path());
let (index_scheduler, auth) = setup_meilisearch(&options).unwrap(); let (index_scheduler, auth) = setup_meilisearch(&options).unwrap();
let service = Service { index_scheduler, auth, options, api_key: None }; let service = Service {
index_scheduler,
auth,
api_key: None,
search_queue: Self::new_search_queue(&options),
options,
};
Server { service, _dir: Some(dir), _marker: PhantomData } Server { service, _dir: Some(dir), _marker: PhantomData }
} }

3
meilisearch/tests/content_type.rs
View File

@ -6,6 +6,7 @@ use actix_web::test;
use crate::common::{Server, Value}; use crate::common::{Server, Value};
#[derive(Debug)]
enum HttpVerb { enum HttpVerb {
Put, Put,
Patch, Patch,
@ -80,7 +81,7 @@ async fn error_json_bad_content_type() {
let status_code = res.status(); let status_code = res.status();
let body = test::read_body(res).await; let body = test::read_body(res).await;
let response: Value = serde_json::from_slice(&body).unwrap_or_default(); let response: Value = serde_json::from_slice(&body).unwrap_or_default();
assert_eq!(status_code, 415, "calling the route `{}` without content-type is supposed to throw a bad media type error", route); assert_eq!(status_code, 415, "calling the route `{verb:?} {route}` without content-type is supposed to throw a bad media type error:\n{}", String::from_utf8_lossy(&body));
assert_eq!( assert_eq!(
response, response,
json!({ json!({