Move server tests into integration tests

MathiasPius · Apr 4, 2024 · a49ef55 · a49ef55
1 parent b6adbfa
commit a49ef55
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 76 deletions.
diff --git a/src/api/server/mod.rs b/src/api/server/mod.rs
@@ -243,79 +243,3 @@ impl AsyncRobot {
             .0)
     }
 }
-
-#[cfg(test)]
-mod tests {
-
-    #[cfg(feature = "non-disruptive-tests")]
-    mod non_disruptive_tests {
-        use tracing::info;
-        use tracing_test::traced_test;
-
-        use crate::{
-            api::server::{Cancellation, ServerId},
-            error::{ApiError, Error},
-        };
-
-        #[tokio::test]
-        #[traced_test]
-        async fn test_list_servers() {
-            let _ = dotenvy::dotenv().ok();
-
-            let robot = crate::AsyncRobot::default();
-
-            let servers = robot.list_servers().await.unwrap();
-            info!("{servers:#?}");
-        }
-
-        #[tokio::test]
-        #[traced_test]
-        async fn test_get_server() {
-            let _ = dotenvy::dotenv().ok();
-
-            let robot = crate::AsyncRobot::default();
-
-            let servers = robot.list_servers().await.unwrap();
-            info!("{servers:#?}");
-
-            if let Some(server) = servers.first() {
-                let retrieved_server = robot.get_server(server.id).await.unwrap();
-
-                assert_eq!(retrieved_server.name, server.name);
-            }
-        }
-
-        #[tokio::test]
-        #[traced_test]
-        async fn test_get_nonexistent_server() {
-            let _ = dotenvy::dotenv().ok();
-
-            let robot = crate::AsyncRobot::default();
-
-            let result = robot.get_server(ServerId(1)).await;
-            info!("{result:#?}");
-
-            assert!(matches!(
-                result,
-                Err(Error::Api(ApiError::ServerNotFound { .. }))
-            ));
-        }
-
-        #[tokio::test]
-        #[traced_test]
-        async fn test_get_server_cancellation() {
-            let _ = dotenvy::dotenv().ok();
-
-            let robot = crate::AsyncRobot::default();
-
-            let servers = robot.list_servers().await.unwrap();
-            info!("{servers:#?}");
-
-            if let Some(server) = servers.first() {
-                let status = robot.get_server_cancellation(server.id).await.unwrap();
-                info!("{status:#?}");
-                assert!(matches!(status, Cancellation::Cancellable(_)));
-            }
-        }
-    }
-}
diff --git a/tests/server.rs b/tests/server.rs
@@ -0,0 +1,62 @@
+mod common;
+
+use hrobot::{
+    api::server::{Cancellation, ServerId},
+    error::{ApiError, Error},
+    AsyncRobot,
+};
+use tracing::info;
+use tracing_test::traced_test;
+
+#[tokio::test]
+#[traced_test]
+async fn list_servers() {
+    let _ = dotenvy::dotenv().ok();
+
+    let robot = crate::AsyncRobot::default();
+
+    let servers = robot.list_servers().await.unwrap();
+    info!("{servers:#?}");
+}
+
+#[tokio::test]
+#[traced_test]
+async fn get_server() {
+    let _ = dotenvy::dotenv().ok();
+
+    let robot = crate::AsyncRobot::default();
+
+    let server = common::provisioned_server().await;
+    let retrieved_server = robot.get_server(server.id).await.unwrap();
+
+    assert_eq!(retrieved_server.name, server.name);
+}
+
+#[tokio::test]
+#[traced_test]
+async fn get_nonexistent_server() {
+    let _ = dotenvy::dotenv().ok();
+
+    let robot = AsyncRobot::default();
+
+    let result = robot.get_server(ServerId(1)).await;
+    info!("{result:#?}");
+
+    assert!(matches!(
+        result,
+        Err(Error::Api(ApiError::ServerNotFound { .. }))
+    ));
+}
+
+#[tokio::test]
+#[traced_test]
+async fn get_server_cancellation() {
+    let _ = dotenvy::dotenv().ok();
+
+    let robot = crate::AsyncRobot::default();
+
+    let server = common::provisioned_server().await;
+    let status = robot.get_server_cancellation(server.id).await.unwrap();
+    info!("{status:#?}");
+    assert!(matches!(status, Cancellation::Cancellable(_)));
+}