From 32f0799ebb35677c57e18092e6f074cccc2e36ed Mon Sep 17 00:00:00 2001 From: Rudi Floren Date: Fri, 10 Feb 2023 13:39:24 +0100 Subject: Add impl From<{Template}> for hyper::Body derive with-hyper now derives an impl allowing Templates to be passed to functions with trait bounds for Into. --- askama_hyper/tests/basic.rs | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) (limited to 'askama_hyper/tests') diff --git a/askama_hyper/tests/basic.rs b/askama_hyper/tests/basic.rs index efa8ba5..831bcbb 100644 --- a/askama_hyper/tests/basic.rs +++ b/askama_hyper/tests/basic.rs @@ -2,6 +2,7 @@ use std::convert::Infallible; use askama::Template; use hyper::body::to_bytes; +use hyper::http::response::Builder; use hyper::{Body, Client, Request, Response, Server}; use routerify::ext::RequestExt; use routerify::{Router, RouterService}; @@ -21,9 +22,16 @@ async fn hello_handler(req: Request) -> Result, Infallible> Ok(template.into()) } +async fn body_handler(req: Request) -> Result, Infallible> { + let name = req.param("name").unwrap(); + let template = &HelloTemplate { name: &name }; + Ok(Builder::new().body(template.into()).unwrap()) +} + fn router() -> Router { Router::builder() .get("/hello/:name", hello_handler) + .get("/body/:name", body_handler) .build() .unwrap() } @@ -35,14 +43,40 @@ async fn test_hyper() { let server = Server::bind(&addr).serve(service); let local_addr = server.local_addr(); - let (tx, rx) = tokio::sync::oneshot::channel::<()>(); + let (tx1, rx1) = tokio::sync::oneshot::channel::<()>(); + let (tx2, rx2) = tokio::sync::oneshot::channel::<()>(); let serve = async move { let server = server.with_graceful_shutdown(async { - rx.await.expect("Could not await signal to stop"); + rx1.await.expect("Could not await signal to stop"); + rx2.await.expect("Could not await signal to stop"); }); server.await.expect("Could not serve"); }; - let query = async move { + let hello_query = async move { + let uri = format!("http://{local_addr}/hello/world") + .parse() + .expect("Could not format URI"); + let client = Client::new(); + + let res = client.get(uri).await.expect("Could not query client"); + assert_eq!(res.status(), hyper::StatusCode::OK); + + let content_type = res + .headers() + .get("content-type") + .expect("Response did not contain content-type header") + .to_str() + .expect("Content-type was not a UTF-8 string"); + assert_eq!(content_type, mime::TEXT_HTML_UTF_8.to_string()); + + let body = to_bytes(res).await.expect("No body returned"); + let body = std::str::from_utf8(&body).expect("Body was not UTF-8"); + assert_eq!(body, "Hello, world!"); + + tx1.send(()).unwrap(); + }; + + let body_query = async move { let uri = format!("http://{local_addr}/hello/world") .parse() .expect("Could not format URI"); @@ -63,8 +97,8 @@ async fn test_hyper() { let body = std::str::from_utf8(&body).expect("Body was not UTF-8"); assert_eq!(body, "Hello, world!"); - tx.send(()).unwrap(); + tx2.send(()).unwrap(); }; - tokio::join!(serve, query); + tokio::join!(serve, body_query, hello_query); } -- cgit