matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-04 18:42:14 +03:00
Code Activity

Fix the mas-http tests

Browse Source
This commit is contained in:
Quentin Gliech
2024-07-01 19:30:51 +02:00
parent dcb9bdeecf
commit f338aacf26
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/http/tests/client_layers.rs
View File

@@ -18,6 +18,7 @@ use anyhow::{bail, Context};
use bytes::{Buf, Bytes}; use bytes::{Buf, Bytes};
use headers::{ContentType, HeaderMapExt}; use headers::{ContentType, HeaderMapExt};
use http::{header::ACCEPT, HeaderValue, Request, Response, StatusCode}; use http::{header::ACCEPT, HeaderValue, Request, Response, StatusCode};
use http_body_util::{BodyExt, Empty};
use mas_http::{ use mas_http::{
BodyToBytesResponseLayer, BytesToBodyRequestLayer, CatchHttpCodesLayer, BodyToBytesResponseLayer, BytesToBodyRequestLayer, CatchHttpCodesLayer,
FormUrlencodedRequestLayer, JsonRequestLayer, JsonResponseLayer, FormUrlencodedRequestLayer, JsonRequestLayer, JsonResponseLayer,
@@ -51,7 +52,7 @@ async fn test_http_errors() {
); );
let svc = layer.layer(service_fn(handle)); let svc = layer.layer(service_fn(handle));
let request = Request::new(hyper::Body::empty()); let request = Request::new(Empty::<Bytes>::new());
let res = svc.oneshot(request).await; let res = svc.oneshot(request).await;
let err = res.expect_err("the request should fail"); let err = res.expect_err("the request should fail");
@@ -60,7 +61,7 @@ async fn test_http_errors() {
#[tokio::test] #[tokio::test]
async fn test_json_request_body() { async fn test_json_request_body() {
async fn handle<B>(request: Request<B>) -> Result<Response<hyper::Body>, anyhow::Error> async fn handle<B>(request: Request<B>) -> Result<Response<Empty<Bytes>>, anyhow::Error>
where where
B: http_body::Body + Send, B: http_body::Body + Send,
B::Error: std::error::Error + Send + Sync + 'static, B::Error: std::error::Error + Send + Sync + 'static,
@@ -74,12 +75,12 @@ async fn test_json_request_body() {
bail!("Content-Type header is not application/json") bail!("Content-Type header is not application/json")
} }
let bytes = hyper::body::to_bytes(request.into_body()).await?; let bytes = request.into_body().collect().await?.to_bytes();
if bytes.to_vec() != br#"{"hello":"world"}"#.to_vec() { if bytes.to_vec() != br#"{"hello":"world"}"#.to_vec() {
bail!("Body mismatch") bail!("Body mismatch")
} }
let res = Response::new(hyper::Body::empty()); let res = Response::new(Empty::new());
Ok(res) Ok(res)
} }
@@ -111,7 +112,7 @@ async fn test_json_response_body() {
let layer = (JsonResponseLayer::default(), BodyToBytesResponseLayer); let layer = (JsonResponseLayer::default(), BodyToBytesResponseLayer);
let svc = layer.layer(service_fn(handle)); let svc = layer.layer(service_fn(handle));
let request = Request::new(hyper::Body::empty()); let request = Request::new(Empty::<Bytes>::new());
let res = svc.oneshot(request).await; let res = svc.oneshot(request).await;
let response = res.expect("the request to succeed"); let response = res.expect("the request to succeed");
@@ -121,7 +122,7 @@ async fn test_json_response_body() {
#[tokio::test] #[tokio::test]
async fn test_urlencoded_request_body() { async fn test_urlencoded_request_body() {
async fn handle<B>(request: Request<B>) -> Result<Response<hyper::Body>, anyhow::Error> async fn handle<B>(request: Request<B>) -> Result<Response<Empty<Bytes>>, anyhow::Error>
where where
B: http_body::Body + Send, B: http_body::Body + Send,
B::Error: std::error::Error + Send + Sync + 'static, B::Error: std::error::Error + Send + Sync + 'static,
@@ -135,10 +136,10 @@ async fn test_urlencoded_request_body() {
bail!("Content-Type header is not application/x-form-urlencoded") bail!("Content-Type header is not application/x-form-urlencoded")
} }
let bytes = hyper::body::to_bytes(request.into_body()).await?; let bytes = request.into_body().collect().await?.to_bytes();
assert_eq!(bytes.to_vec(), br"hello=world".to_vec()); assert_eq!(bytes.to_vec(), br"hello=world".to_vec());
let res = Response::new(hyper::Body::empty()); let res = Response::new(Empty::new());
Ok(res) Ok(res)
} }