Refactor test
Rust Build / Test Suite (pull_request) Successful in 1m8s
Rust Build / Rustfmt (pull_request) Successful in 1m10s
Rust Build / Check (pull_request) Successful in 1m40s
Rust Build / Clippy (pull_request) Successful in 2m9s
Rust Build / build (pull_request) Successful in 3m0s
Rust Build / Test Suite (pull_request) Successful in 1m8s
Rust Build / Rustfmt (pull_request) Successful in 1m10s
Rust Build / Check (pull_request) Successful in 1m40s
Rust Build / Clippy (pull_request) Successful in 2m9s
Rust Build / build (pull_request) Successful in 3m0s
This commit is contained in:
+18
-10
@@ -170,10 +170,13 @@ const TEST_SERVICE_USERNAME: &str = "swoon";
|
|||||||
/// Test service passphrase
|
/// Test service passphrase
|
||||||
const TEST_SERVICE_PASSPHRASE: &str = "4n5cf349tfy34w857ty39wq45nfdq23";
|
const TEST_SERVICE_PASSPHRASE: &str = "4n5cf349tfy34w857ty39wq45nfdq23";
|
||||||
|
|
||||||
async fn convert_response<T>(response: axum::response::Response) -> Result<T, std::io::Error>
|
mod util {
|
||||||
where
|
pub async fn convert_response<T>(
|
||||||
|
response: axum::response::Response,
|
||||||
|
) -> Result<T, std::io::Error>
|
||||||
|
where
|
||||||
T: serde::de::DeserializeOwned,
|
T: serde::de::DeserializeOwned,
|
||||||
{
|
{
|
||||||
match axum::body::to_bytes(response.into_body(), usize::MAX).await {
|
match axum::body::to_bytes(response.into_body(), usize::MAX).await {
|
||||||
Ok(body) => {
|
Ok(body) => {
|
||||||
let resp: T = serde_json::from_slice(&body).unwrap();
|
let resp: T = serde_json::from_slice(&body).unwrap();
|
||||||
@@ -181,6 +184,7 @@ where
|
|||||||
}
|
}
|
||||||
Err(err) => Err(std::io::Error::other(err.to_string())),
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn register_user(
|
async fn register_user(
|
||||||
@@ -194,7 +198,9 @@ async fn register_user(
|
|||||||
response.status()
|
response.status()
|
||||||
)))
|
)))
|
||||||
} else {
|
} else {
|
||||||
match convert_response::<callers::register::response::Response>(response).await {
|
match util::convert_response::<callers::register::response::Response>(response)
|
||||||
|
.await
|
||||||
|
{
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
if response.data.len() > 0 {
|
if response.data.len() > 0 {
|
||||||
let user = response.data[0].clone();
|
let user = response.data[0].clone();
|
||||||
@@ -224,7 +230,9 @@ async fn login_user(
|
|||||||
response.status()
|
response.status()
|
||||||
)))
|
)))
|
||||||
} else {
|
} else {
|
||||||
match convert_response::<callers::login::response::LoginResponse>(response).await {
|
match util::convert_response::<callers::login::response::LoginResponse>(response)
|
||||||
|
.await
|
||||||
|
{
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
if response.data.len() > 0 {
|
if response.data.len() > 0 {
|
||||||
let user = response.data[0].clone();
|
let user = response.data[0].clone();
|
||||||
@@ -252,9 +260,9 @@ async fn register_service_user(
|
|||||||
response.status()
|
response.status()
|
||||||
)))
|
)))
|
||||||
} else {
|
} else {
|
||||||
match convert_response::<callers::register::response::RegisterServiceUserResponse>(
|
match util::convert_response::<
|
||||||
response,
|
callers::register::response::RegisterServiceUserResponse,
|
||||||
)
|
>(response)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
@@ -286,7 +294,7 @@ async fn login_service_user(
|
|||||||
response.status()
|
response.status()
|
||||||
)))
|
)))
|
||||||
} else {
|
} else {
|
||||||
match convert_response::<callers::login::response::ServiceUserLoginResponse>(
|
match util::convert_response::<callers::login::response::ServiceUserLoginResponse>(
|
||||||
response,
|
response,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
@@ -415,7 +423,7 @@ async fn test_register_service_user() {
|
|||||||
|
|
||||||
match requests::register_service_user(&app).await {
|
match requests::register_service_user(&app).await {
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
match convert_response::<callers::register::response::RegisterServiceUserResponse>(
|
match util::convert_response::<callers::register::response::RegisterServiceUserResponse>(
|
||||||
response,
|
response,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
|||||||
Reference in New Issue
Block a user