chore: update test-context dependency (#1665)

* chore: update test-context dependency

* fix: don't use async_trait for AsyncTestContext implementations

Cargo.toml

@@ -89,7 +89,7 @@ strfmt = "0.2.2"
 strum = { version = "0.25.0", features = ["derive"] }
 tar = "0.4.38"
 tempfile = "3.4.0"
-test-context = "0.1.4"
+test-context = "0.3.0"
 thiserror = "1.0.37"
 tokio = "1.22.0"
 tokio-stream = "0.1.11"

common/src/backends/client/gateway.rs

@@ -114,23 +114,21 @@ impl ProjectsDal for Client {
 
 #[cfg(test)]
 mod tests {
-    use async_trait::async_trait;
     use test_context::{test_context, AsyncTestContext};
 
     use crate::models::project::{Response, State};
     use crate::test_utils::get_mocked_gateway_server;
 
     use super::{Client, ProjectsDal};
 
-    #[async_trait]
     impl AsyncTestContext for Client {
         async fn setup() -> Self {
             let server = get_mocked_gateway_server().await;
 
             Client::new(server.uri().parse().unwrap(), server.uri().parse().unwrap())
         }
 
-        async fn teardown(mut self) {}
+        async fn teardown(self) {}
     }
 
     #[test_context(Client)]

gateway/src/lib.rs

@@ -884,7 +884,6 @@ pub mod tests {
         }
     }
 
-    #[async_trait]
     impl AsyncTestContext for TestGateway {
         async fn setup() -> Self {
             let world = World::new().await;
@@ -903,7 +902,7 @@ pub mod tests {
             }
         }
 
-        async fn teardown(mut self) {}
+        async fn teardown(self) {}
     }
 
     /// Helper struct to wrap a bunch of commands to run against a test project
@@ -1159,7 +1158,6 @@ pub mod tests {
         }
     }
 
-    #[async_trait]
     impl AsyncTestContext for TestProject {
         async fn setup() -> Self {
             let mut world = TestGateway::setup().await;

proto/src/lib.rs

@@ -305,7 +305,6 @@ mod _resource_recorder_client {
 
     #[cfg(test)]
     mod tests {
-        use async_trait::async_trait;
         use serde_json::json;
         use shuttle_common::{database, resource};
         use test_context::{test_context, AsyncTestContext};
@@ -316,15 +315,14 @@ mod _resource_recorder_client {
 
         use super::{get_client, Client, ResourceDal};
 
-        #[async_trait]
         impl AsyncTestContext for Client {
             async fn setup() -> Self {
                 let port = get_mocked_resource_recorder().await;
 
                 get_client(format!("http://localhost:{port}").parse().unwrap()).await
             }
 
-            async fn teardown(mut self) {}
+            async fn teardown(self) {}
         }
 
         #[test_context(Client)]