From a56e8c1a0c3d46b9787235f6f81045f682a9cf60 Mon Sep 17 00:00:00 2001
From: mpostma <postma.marin@protonmail.com>
Date: Wed, 10 Mar 2021 14:47:04 +0100
Subject: [PATCH] fix tests

---
 Cargo.lock                               |  7 +++++++
 meilisearch-http/Cargo.toml              |  1 +
 meilisearch-http/tests/common/index.rs   |  4 ++--
 meilisearch-http/tests/common/service.rs | 14 +++++++-------
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7f8724ca1..84c9b6854 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1817,6 +1817,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio 1.3.0",
+ "urlencoding",
  "uuid",
  "vergen",
 ]
@@ -3503,6 +3504,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9232eb53352b4442e40d7900465dfc534e8cb2dc8f18656fcb2ac16112b5593"
+
 [[package]]
 name = "utf8-width"
 version = "0.1.4"
diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml
index 0f3d3cb38..b09c52b87 100644
--- a/meilisearch-http/Cargo.toml
+++ b/meilisearch-http/Cargo.toml
@@ -74,6 +74,7 @@ serde_url_params = "0.2.0"
 tempdir = "0.3.7"
 assert-json-diff = { branch = "master", git = "https://github.com/qdequele/assert-json-diff" }
 actix-rt = "2.1.0"
+urlencoding = "1.1.1"
 
 [features]
 default = ["sentry"]
diff --git a/meilisearch-http/tests/common/index.rs b/meilisearch-http/tests/common/index.rs
index 710b96a9f..58a8de200 100644
--- a/meilisearch-http/tests/common/index.rs
+++ b/meilisearch-http/tests/common/index.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use actix_web::http::StatusCode;
 use serde_json::{json, Value};
-use tokio::time::delay_for;
+use tokio::time::sleep;
 
 use super::service::Service;
 
@@ -79,7 +79,7 @@ impl Index<'_> {
                 return response;
             }
 
-            delay_for(Duration::from_secs(1)).await;
+            sleep(Duration::from_secs(1)).await;
         }
         panic!("Timeout waiting for update id");
     }
diff --git a/meilisearch-http/tests/common/service.rs b/meilisearch-http/tests/common/service.rs
index 8e797c00d..feff49cad 100644
--- a/meilisearch-http/tests/common/service.rs
+++ b/meilisearch-http/tests/common/service.rs
@@ -2,14 +2,14 @@ use actix_web::{http::StatusCode, test};
 use serde_json::Value;
 
 use meilisearch_http::data::Data;
-use meilisearch_http::helpers::NormalizePath;
+use meilisearch_http::create_app;
 
 pub struct Service(pub Data);
 
 impl Service {
     pub async fn post(&self, url: impl AsRef<str>, body: Value) -> (Value, StatusCode) {
         let mut app =
-            test::init_service(meilisearch_http::create_app(&self.0, true).wrap(NormalizePath)).await;
+            test::init_service(create_app!(&self.0, true)).await;
 
         let req = test::TestRequest::post()
             .uri(url.as_ref())
@@ -26,12 +26,12 @@ impl Service {
     /// Send a test post request from a text body, with a `content-type:application/json` header.
     pub async fn post_str(&self, url: impl AsRef<str>, body: impl AsRef<str>) -> (Value, StatusCode) {
         let mut app =
-            test::init_service(meilisearch_http::create_app(&self.0, true).wrap(NormalizePath)).await;
+            test::init_service(create_app!(&self.0, true)).await;
 
         let req = test::TestRequest::post()
             .uri(url.as_ref())
             .set_payload(body.as_ref().to_string())
-            .header("content-type", "application/json")
+            .insert_header(("content-type", "application/json"))
             .to_request();
         let res = test::call_service(&mut app, req).await;
         let status_code = res.status();
@@ -43,7 +43,7 @@ impl Service {
 
     pub async fn get(&self, url: impl AsRef<str>) -> (Value, StatusCode) {
         let mut app =
-            test::init_service(meilisearch_http::create_app(&self.0, true).wrap(NormalizePath)).await;
+            test::init_service(create_app!(&self.0, true)).await;
 
         let req = test::TestRequest::get().uri(url.as_ref()).to_request();
         let res = test::call_service(&mut app, req).await;
@@ -56,7 +56,7 @@ impl Service {
 
     pub async fn put(&self, url: impl AsRef<str>, body: Value) -> (Value, StatusCode) {
         let mut app =
-            test::init_service(meilisearch_http::create_app(&self.0, true).wrap(NormalizePath)).await;
+            test::init_service(create_app!(&self.0, true)).await;
 
         let req = test::TestRequest::put()
             .uri(url.as_ref())
@@ -72,7 +72,7 @@ impl Service {
 
     pub async fn delete(&self, url: impl AsRef<str>) -> (Value, StatusCode) {
         let mut app =
-            test::init_service(meilisearch_http::create_app(&self.0, true).wrap(NormalizePath)).await;
+            test::init_service(create_app!(&self.0, true)).await;
 
         let req = test::TestRequest::delete().uri(url.as_ref()).to_request();
         let res = test::call_service(&mut app, req).await;