|
1 | 1 | use axum::{middleware, response::IntoResponse}; |
2 | 2 | use axum_sqlx_tx::State; |
3 | | -use http_body_util::BodyExt; |
4 | 3 | use sqlx::{sqlite::SqliteArguments, Arguments as _}; |
5 | 4 | use tower::ServiceExt; |
6 | 5 |
|
@@ -124,7 +123,9 @@ async fn extract_from_middleware_and_handler() { |
124 | 123 | .await |
125 | 124 | .unwrap(); |
126 | 125 | let status = response.status(); |
127 | | - let body = response.into_body().collect().await.unwrap().to_bytes(); |
| 126 | + let body = axum::body::to_bytes(response.into_body(), usize::MAX) |
| 127 | + .await |
| 128 | + .unwrap(); |
128 | 129 |
|
129 | 130 | assert!(status.is_success()); |
130 | 131 | assert_eq!(body.as_ref(), b"[[1,\"bobby tables\"]]"); |
@@ -165,7 +166,9 @@ async fn middleware_cloning_request_extensions() { |
165 | 166 | .await |
166 | 167 | .unwrap(); |
167 | 168 | let status = response.status(); |
168 | | - let body = response.into_body().collect().await.unwrap().to_bytes(); |
| 169 | + let body = axum::body::to_bytes(response.into_body(), usize::MAX) |
| 170 | + .await |
| 171 | + .unwrap(); |
169 | 172 | dbg!(body); |
170 | 173 |
|
171 | 174 | assert!(status.is_success()); |
@@ -227,7 +230,9 @@ async fn missing_layer() { |
227 | 230 |
|
228 | 231 | assert!(response.status().is_server_error()); |
229 | 232 |
|
230 | | - let body = response.into_body().collect().await.unwrap().to_bytes(); |
| 233 | + let body = axum::body::to_bytes(response.into_body(), usize::MAX) |
| 234 | + .await |
| 235 | + .unwrap(); |
231 | 236 | assert_eq!(body, format!("{}", axum_sqlx_tx::Error::MissingExtension)); |
232 | 237 | } |
233 | 238 |
|
@@ -296,7 +301,9 @@ async fn layer_error_override() { |
296 | 301 | .await |
297 | 302 | .unwrap(); |
298 | 303 | let status = response.status(); |
299 | | - let body = response.into_body().collect().await.unwrap().to_bytes(); |
| 304 | + let body = axum::body::to_bytes(response.into_body(), usize::MAX) |
| 305 | + .await |
| 306 | + .unwrap(); |
300 | 307 |
|
301 | 308 | assert!(status.is_client_error()); |
302 | 309 | assert_eq!(body, "internal server error"); |
@@ -443,7 +450,9 @@ where |
443 | 450 | .await |
444 | 451 | .unwrap(); |
445 | 452 | let status = response.status(); |
446 | | - let body = response.into_body().collect().await.unwrap().to_bytes(); |
| 453 | + let body = axum::body::to_bytes(response.into_body(), usize::MAX) |
| 454 | + .await |
| 455 | + .unwrap(); |
447 | 456 |
|
448 | 457 | (pool, Response { status, body }) |
449 | 458 | } |
|
0 commit comments