add tests

This commit is contained in:
mpostma 2021-02-24 11:15:48 +01:00
parent 3987d17e40
commit 561f29042c
No known key found for this signature in database
GPG Key ID: CBC8A7C1D7A28C3A
6 changed files with 38 additions and 6 deletions

7
Cargo.lock generated
View File

@ -1677,6 +1677,7 @@ dependencies = [
"tempdir", "tempdir",
"tempfile", "tempfile",
"tokio", "tokio",
"urlencoding",
"uuid", "uuid",
"vergen", "vergen",
] ]
@ -3298,6 +3299,12 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "urlencoding"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9232eb53352b4442e40d7900465dfc534e8cb2dc8f18656fcb2ac16112b5593"
[[package]] [[package]]
name = "utf8-width" name = "utf8-width"
version = "0.1.4" version = "0.1.4"

View File

@ -71,6 +71,7 @@ serde_url_params = "0.2.0"
tempdir = "0.3.7" tempdir = "0.3.7"
assert-json-diff = { branch = "master", git = "https://github.com/qdequele/assert-json-diff" } assert-json-diff = { branch = "master", git = "https://github.com/qdequele/assert-json-diff" }
tokio = { version = "0.2", features = ["macros", "time"] } tokio = { version = "0.2", features = ["macros", "time"] }
urlencoding = "1.1.1"
[features] [features]
default = ["sentry"] default = ["sentry"]

View File

@ -1,7 +1,8 @@
use tempdir::TempDir; use actix_web::http::StatusCode;
use byte_unit::{Byte, ByteUnit}; use byte_unit::{Byte, ByteUnit};
use serde_json::Value; use serde_json::Value;
use actix_web::http::StatusCode; use tempdir::TempDir;
use urlencoding::encode;
use meilisearch_http::data::Data; use meilisearch_http::data::Data;
use meilisearch_http::option::{Opt, IndexerOpts}; use meilisearch_http::option::{Opt, IndexerOpts};
@ -60,7 +61,7 @@ impl Server {
/// Returns a view to an index. There is no guarantee that the index exists. /// Returns a view to an index. There is no guarantee that the index exists.
pub fn index<'a>(&'a self, uid: impl AsRef<str>) -> Index<'a> { pub fn index<'a>(&'a self, uid: impl AsRef<str>) -> Index<'a> {
Index { Index {
uid: uid.as_ref().to_string(), uid: encode(uid.as_ref()),
service: &self.service, service: &self.service,
} }
} }

View File

@ -45,6 +45,22 @@ async fn add_documents_no_index_creation() {
assert_eq!(response["primaryKey"], "id"); assert_eq!(response["primaryKey"], "id");
} }
#[actix_rt::test]
async fn document_add_create_index_bad_uid() {
let server = Server::new().await;
let index = server.index("883 fj!");
let (_response, code) = index.add_documents(json!([]), None).await;
assert_eq!(code, 400);
}
#[actix_rt::test]
async fn document_update_create_index_bad_uid() {
let server = Server::new().await;
let index = server.index("883 fj!");
let (_response, code) = index.update_documents(json!([]), None).await;
assert_eq!(code, 400);
}
#[actix_rt::test] #[actix_rt::test]
async fn document_addition_with_primary_key() { async fn document_addition_with_primary_key() {
let server = Server::new().await; let server = Server::new().await;

View File

@ -47,12 +47,10 @@ async fn create_existing_index() {
assert_eq!(code, 400); assert_eq!(code, 400);
} }
// test fails (issue #46)
#[actix_rt::test] #[actix_rt::test]
#[ignore]
async fn create_with_invalid_index_uid() { async fn create_with_invalid_index_uid() {
let server = Server::new().await; let server = Server::new().await;
let index = server.index("test test"); let index = server.index("test test#!");
let (_, code) = index.create(None).await; let (_, code) = index.create(None).await;
assert_eq!(code, 400); assert_eq!(code, 400);
} }

View File

@ -90,6 +90,15 @@ async fn update_setting_unexisting_index() {
assert_eq!(code, 200); assert_eq!(code, 200);
} }
#[actix_rt::test]
async fn update_setting_unexisting_index_invalid_uid() {
let server = Server::new().await;
let index = server.index("test##! ");
let (_response, code) = index.update_settings(json!({})).await;
println!("response: {}", _response);
assert_eq!(code, 400);
}
macro_rules! test_setting_routes { macro_rules! test_setting_routes {
($($setting:ident), *) => { ($($setting:ident), *) => {
$( $(