From 919803a2cceac9b231bb9a159e1a1810be86f506 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 12 Aug 2026 16:23:32 -0400 Subject: [PATCH] Saving test --- src/main.rs | 94 +++++------------------------------------------------ 1 file changed, 8 insertions(+), 86 deletions(-) diff --git a/src/main.rs b/src/main.rs index cb4fd1f..ae8a1df 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1023,13 +1023,6 @@ mod tests { } let songpath = song.song_path().unwrap(); - let mut form = MultipartForm::default(); - let _ = form.add_file("flac", &songpath); - - // Create request - let content_type = form.content_type(); - let body = MultipartBody::from(form); - let raw_uri = String::from(crate::callers::queue::endpoints::QUEUESONGUPDATE); let end_index = raw_uri.len() - 5; @@ -1043,16 +1036,7 @@ mod tests { match app .clone() .oneshot( - axum::http::Request::builder() - .method(axum::http::Method::PATCH) - .uri(uri) - .header(axum::http::header::CONTENT_TYPE, content_type) - .header( - axum::http::header::AUTHORIZATION, - bearer_auth().await, - ) - .body(axum::body::Body::from_stream(body)) - .unwrap(), + request::run_post(Some(request::ReqBody::Multipart(("flac".to_string(), songpath))), &uri, axum::http::Method::PATCH, true).await.unwrap() ) .await { @@ -1928,19 +1912,7 @@ mod tests { match app .clone() .oneshot( - axum::http::Request::builder() - .method(axum::http::Method::PATCH) - .uri(crate::callers::queue::endpoints::QUEUECOVERARTDATAWIPE) - .header( - axum::http::header::CONTENT_TYPE, - "application/json", - ) - .header( - axum::http::header::AUTHORIZATION, - bearer_auth().await, - ) - .body(axum::body::Body::from(payload.to_string())) - .unwrap(), + request::run_post(Some(request::ReqBody::Json(payload)), crate::callers::queue::endpoints::QUEUECOVERARTDATAWIPE, axum::http::Method::PATCH, true).await.unwrap() ) .await { @@ -2008,16 +1980,7 @@ mod tests { match app .clone() .oneshot( - axum::http::Request::builder() - .method(axum::http::Method::GET) - .uri(uri) - .header(axum::http::header::CONTENT_TYPE, "application/json") - .header( - axum::http::header::AUTHORIZATION, - super::bearer_auth().await, - ) - .body(axum::body::Body::empty()) - .unwrap(), + super::request::run_post(None, &uri, axum::http::Method::GET, false).await.unwrap() ) .await { @@ -2065,16 +2028,7 @@ mod tests { match app .clone() .oneshot( - axum::http::Request::builder() - .method(axum::http::Method::GET) - .uri(uri) - .header(axum::http::header::CONTENT_TYPE, "application/json") - .header( - axum::http::header::AUTHORIZATION, - super::bearer_auth().await, - ) - .body(axum::body::Body::empty()) - .unwrap(), + super::request::run_post(None, &uri, axum::http::Method::GET, false).await.unwrap() ) .await { @@ -2154,15 +2108,7 @@ mod tests { match app .clone() .oneshot( - axum::http::Request::builder() - .method(axum::http::Method::GET) - .uri(&uri) - .header( - axum::http::header::AUTHORIZATION, - super::bearer_auth().await, - ) - .body(axum::body::Body::empty()) - .unwrap(), + super::request::run_post(None, &uri, axum::http::Method::GET, false).await.unwrap() ) .await { @@ -2214,15 +2160,7 @@ mod tests { match app .clone() .oneshot( - axum::http::Request::builder() - .method(axum::http::Method::GET) - .uri(&uri) - .header( - axum::http::header::AUTHORIZATION, - super::bearer_auth().await, - ) - .body(axum::body::Body::empty()) - .unwrap(), + super::request::run_post(None, &uri, axum::http::Method::GET, false).await.unwrap() ) .await { @@ -2276,15 +2214,7 @@ mod tests { match app .clone() .oneshot( - axum::http::Request::builder() - .method(axum::http::Method::GET) - .uri(&uri) - .header( - axum::http::header::AUTHORIZATION, - super::bearer_auth().await, - ) - .body(axum::body::Body::empty()) - .unwrap(), + super::request::run_post(None, &uri, axum::http::Method::GET, false).await.unwrap() ) .await { @@ -2403,15 +2333,7 @@ mod tests { match app .clone() .oneshot( - axum::http::Request::builder() - .method(axum::http::Method::DELETE) - .uri(&uri) - .header( - axum::http::header::AUTHORIZATION, - super::bearer_auth().await, - ) - .body(axum::body::Body::empty()) - .unwrap(), + super::request::run_post(None, &uri, axum::http::Method::DELETE, false).await.unwrap() ) .await {