tests: commonize test request wrappers

Author: ReenigneArcher

tests/test_web/mod.rs

@@ -11,32 +11,41 @@ pub struct TestResponse {
     pub headers: Vec<Header<'static>>,
 }
 
-pub async fn test_route(
+pub async fn test_request(
+    method: &str,
     path: &'static str,
+    json: Option<Value>,
     expected_status: Status,
+    client: Option<&Client>,
 ) -> TestResponse {
-    let rocket = web::rocket();
-    let client = Client::tracked(rocket)
-        .await
-        .expect("Failed to launch web server");
+    let client = match client {
+        Some(c) => c.to_owned(),
+        None => {
+            let rocket = web::rocket();
+            &Client::tracked(rocket)
+                .await
+                .expect("Failed to launch web server")
+        }
+    };
 
-    let response = client.get(path).dispatch().await;
-    create_test_response(response, expected_status).await
-}
+    let request = match method.to_lowercase().as_str() {
+        "get" => client.get(path),
+        "post" => client.post(path),
+        "put" => client.put(path),
+        "delete" => client.delete(path),
+        "patch" => client.patch(path),
+        _ => panic!("Unsupported HTTP method: {}", method),
+    };
 
-pub async fn test_post_json(
-    client: &Client,
-    path: &'static str,
-    json: Value,
-    expected_status: Status,
-) -> TestResponse {
-    let response = client
-        .post(path)
-        .header(ContentType::JSON)
-        .body(json.to_string())
-        .dispatch()
-        .await;
+    let request = if let Some(json_value) = json {
+        request
+            .header(ContentType::JSON)
+            .body(json_value.to_string())
+    } else {
+        request
+    };
 
+    let response = request.dispatch().await;
     create_test_response(response, expected_status).await
 }
 
@@ -63,15 +72,15 @@ async fn create_test_response(
 
 #[rocket::async_test]
 async fn test_swagger_ui_route() {
-    test_route("/swagger-ui/", Status::SeeOther).await;
+    test_request("get", "/swagger-ui/", None, Status::SeeOther, None).await;
 }
 
 #[rocket::async_test]
 async fn test_rapidoc_route() {
-    test_route("/rapidoc/", Status::SeeOther).await;
+    test_request("get", "/rapidoc/", None, Status::SeeOther, None).await;
 }
 
 #[rocket::async_test]
 async fn test_non_existent_route() {
-    test_route("/non-existent", Status::NotFound).await;
+    test_request("get", "/non-existent", None, Status::NotFound, None).await;
 }

tests/test_web/routes/auth.rs

@@ -4,8 +4,7 @@ use serde_json::json;
 use serial_test::serial;
 
 use crate::fixtures;
-use crate::test_web::test_post_json;
-use crate::test_web::test_route;
+use crate::test_web::test_request;
 
 #[rstest]
 #[serial(db)]
@@ -32,27 +31,29 @@ async fn test_login(
     let client = &db.client;
 
     // Create test user
-    test_post_json(
-        client,
+    test_request(
+        "post",
         "/create_user",
-        json!({
+        Some(json!({
             "username": username_0,
             "password": password_0,
             "admin": false
-        }),
+        })),
         Status::Ok,
+        Some(client),
     )
     .await;
 
     // Test login
-    let response = test_post_json(
-        client,
+    let response = test_request(
+        "post",
         "/login",
-        json!({
+        Some(json!({
             "username": username_1,
             "password": password_1
-        }),
+        })),
         expected_status,
+        Some(client),
     )
     .await;
 
@@ -63,5 +64,5 @@ async fn test_login(
 
 #[rocket::async_test]
 async fn test_logout_route() {
-    test_route("/logout", Status::Ok).await;
+    test_request("get", "/logout", None, Status::Ok, None).await;
 }

tests/test_web/routes/common.rs

@@ -1,10 +1,10 @@
-use crate::test_web::test_route;
+use crate::test_web::test_request;
 
 use rocket::http::Status;
 
 #[rocket::async_test]
 async fn test_root_route() {
-    let response = test_route("/", Status::Ok).await;
+    let response = test_request("get", "/", None, Status::Ok, None).await;
 
     assert_eq!(response.body, "Welcome to Koko!");
 }

tests/test_web/routes/dependencies.rs

@@ -1,11 +1,11 @@
-use crate::test_web::test_route;
+use crate::test_web::test_request;
 
 use rocket::http::Status;
 use rocket::serde::json::{serde_json, Value};
 
 #[rocket::async_test]
 async fn test_get_dependencies_route() {
-    let response = test_route("/dependencies", Status::Ok).await;
+    let response = test_request("get", "/dependencies", None, Status::Ok, None).await;
 
     // ensure response is a json list of dictionaries, and each dictionary has the keys name, version, and license
     let body = response.body;

tests/test_web/routes/user.rs

@@ -4,7 +4,7 @@ use serde_json::json;
 use serial_test::serial;
 
 use crate::fixtures;
-use crate::test_web::test_post_json;
+use crate::test_web::test_request;
 
 #[rstest]
 #[serial(db)]
@@ -23,16 +23,17 @@ async fn test_create_first_user(
     let db = db_future.await;
     let client = &db.client;
 
-    let response = test_post_json(
-        client,
+    let response = test_request(
+        "post",
         "/create_user",
-        json!({
+        Some(json!({
             "username": username,
             "password": password,
             "pin": pin,
             "admin": admin
-        }),
+        })),
         expected_status,
+        Some(client),
     )
     .await;
 
@@ -56,28 +57,30 @@ async fn test_create_subsequent_user_requires_auth(
     let client = &db.client;
 
     // Create first user
-    test_post_json(
-        client,
+    test_request(
+        "post",
         "/create_user",
-        json!({
+        Some(json!({
             "username": "user1",
             "password": "password123",
             "admin": true
-        }),
+        })),
         Status::Ok,
+        Some(client),
     )
     .await;
 
     // Try to create second user without auth
-    test_post_json(
-        client,
+    test_request(
+        "post",
         "/create_user",
-        json!({
+        Some(json!({
             "username": username,
             "password": password,
             "admin": admin
-        }),
+        })),
         expected_status,
+        Some(client),
     )
     .await;
 }