From d280848ff6d6f92e2d636edfb4ba6a2e12565788 Mon Sep 17 00:00:00 2001 From: Quentin de Quelen Date: Sat, 18 Jan 2020 19:00:41 +0100 Subject: [PATCH] add test for settings --- Cargo.lock | 12 +++- meilisearch-http/Cargo.toml | 5 +- meilisearch-http/tests/settings.rs | 93 ++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 meilisearch-http/tests/settings.rs diff --git a/Cargo.lock b/Cargo.lock index 3a1ac833c..1102873a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,6 +34,15 @@ name = "arc-swap" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "assert-json-diff" +version = "1.0.1" +source = "git+https://github.com/qdequele/assert-json-diff#0340008d8fc183a490e3ccf81f86a2355a7474e7" +dependencies = [ + "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "assert_matches" version = "1.3.0" @@ -1011,12 +1020,12 @@ dependencies = [ name = "meilisearch-http" version = "0.8.4" dependencies = [ + "assert-json-diff 1.0.1 (git+https://github.com/qdequele/assert-json-diff)", "async-std 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fst 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heed 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "http-service 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2353,6 +2362,7 @@ dependencies = [ "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14" "checksum arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" +"checksum assert-json-diff 1.0.1 (git+https://github.com/qdequele/assert-json-diff)" = "" "checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" "checksum async-attributes 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423" "checksum async-std 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf6039b315300e057d198b9d3ab92ee029e31c759b7f1afae538145e6f18a3e" diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml index 64dd2ba17..bb6a7a00b 100644 --- a/meilisearch-http/Cargo.toml +++ b/meilisearch-http/Cargo.toml @@ -45,7 +45,10 @@ whoami = "0.6" http-service-mock = "0.4.0" http-service = "0.4.0" tempdir = "0.3.7" -assert-json-diff = "1.0.1" + +[dev-dependencies.assert-json-diff] +git = "https://github.com/qdequele/assert-json-diff" +branch = "master" [build-dependencies] vergen = "3.0.4" diff --git a/meilisearch-http/tests/settings.rs b/meilisearch-http/tests/settings.rs new file mode 100644 index 000000000..eab43741f --- /dev/null +++ b/meilisearch-http/tests/settings.rs @@ -0,0 +1,93 @@ +use std::time::Duration; +use std::convert::Into; + +use async_std::task::{block_on, sleep}; +use async_std::io::prelude::*; +use http_service::Body; +use serde_json::json; +use serde_json::Value; +use assert_json_diff::assert_json_eq; + +mod common; + +#[test] +fn write_all_and_retreive() { + let mut server = common::setup_server().unwrap(); + + // 1 - Create the index + + let body = json!({ + "uid": "movies", + }).to_string().into_bytes(); + + let req = http::Request::post("/indexes").body(Body::from(body)).unwrap(); + let res = server.simulate(req).unwrap(); + assert_eq!(res.status(), 201); + + // 2 - Send the settings + + let json = json!({ + "ranking_rules": [ + "_typo", + "_words", + "_proximity", + "_attribute", + "_words_position", + "_exact", + "dsc(release_date)", + "dsc(rank)", + ], + "ranking_distinct": "movie_id", + "attribute_identifier": "uid", + "attributes_searchable": [ + "uid", + "movie_id", + "title", + "description", + "poster", + "release_date", + "rank", + ], + "attributes_displayed": [ + "title", + "description", + "poster", + "release_date", + "rank", + ], + "attributes_ranked": [ + "release_date", + "rank", + ], + "stop_words": [ + "the", + "a", + "an", + ], + "synonyms": { + "wolverine": ["xmen", "logan"], + "logan": ["wolverine"], + } + }); + + let body = json.to_string().into_bytes(); + + let req = http::Request::post("/indexes/movies/settings").body(Body::from(body)).unwrap(); + let res = server.simulate(req).unwrap(); + assert_eq!(res.status(), 202); + + block_on(sleep(Duration::from_secs(1))); + + let req = http::Request::get("/indexes/movies/settings").body(Body::empty()).unwrap(); + let res = server.simulate(req).unwrap(); + assert_eq!(res.status(), 200); + + let mut buf = Vec::new(); + block_on(res.into_body().read_to_end(&mut buf)).unwrap(); + let res_value: Value = serde_json::from_slice(&buf).unwrap(); + + println!("json1: {:?}", json); + println!("json2: {:?}", res_value); + + assert_json_eq!(json, res_value, ordered: false); +}