fix: remove common_tests dep from common

common-tests/Cargo.toml

@@ -20,5 +20,3 @@ tokio-stream = { workspace = true }
 tonic = { workspace = true }
 tower = { workspace = true }
 uuid = { workspace = true }
-wiremock = { workspace = true }
-http = "1"

common-tests/src/lib.rs

@@ -1,6 +1,5 @@
 pub mod builder;
 pub mod cargo_shuttle;
-pub mod gateway;
 pub mod logger;
 pub mod postgres;
 pub mod resource_recorder;

common/Cargo.toml

@@ -108,9 +108,9 @@ base64 = { workspace = true }
 hyper = { workspace = true }
 proptest = "1.1.0"
 ring = { workspace = true }
-shuttle-common-tests = { workspace = true }
 test-context = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tower = { workspace = true, features = ["util"] }
 tracing-fluent-assertions = "0.3.0"
 tracing-subscriber = { workspace = true }
+wiremock = { workspace = true }

common/src/backends/client/gateway.rs

@@ -75,10 +75,10 @@ impl ProjectsDal for GatewayClient {
 #[cfg(test)]
 mod tests {
     use async_trait::async_trait;
-    use shuttle_common_tests::gateway::mocked_gateway_server;
     use test_context::{test_context, AsyncTestContext};
 
     use crate::models::project::{Response, State};
+    use crate::test_utils::mocked_gateway_server;
 
     use super::{GatewayClient, ProjectsDal};
 

common/src/backends/client/mod.rs

@@ -94,9 +94,9 @@ impl ServicesApiClient {
 mod tests {
     use headers::{authorization::Bearer, Authorization};
     use http::{Method, StatusCode};
-    use shuttle_common_tests::gateway::mocked_gateway_server;
 
     use crate::models;
+    use crate::test_utils::mocked_gateway_server;
 
     use super::{Error, ServicesApiClient};
 

common/src/lib.rs

@@ -26,6 +26,9 @@ pub mod tracing;
 #[cfg(feature = "wasm")]
 pub mod wasm;
 
+#[cfg(test)]
+mod test_utils;
+
 use std::fmt::Debug;
 
 use anyhow::bail;

common-tests/src/gateway.rs → common/src/test_utils.rs

@@ -1,6 +1,6 @@
-use http::Method;
 use serde::Serialize;
 use wiremock::{
+    http,
     matchers::{method, path},
     Mock, MockServer, Request, ResponseTemplate,
 };
@@ -32,10 +32,10 @@ pub async fn mocked_gateway_server() -> MockServer {
         },
     ];
 
-    Mock::given(method(Method::GET))
+    Mock::given(method(http::Method::GET))
         .and(path("/projects"))
         .respond_with(move |req: &Request| {
-            let Some(bearer) = req.headers.get(&http::header::AUTHORIZATION) else {
+            let Some(bearer) = req.headers.get("AUTHORIZATION") else {
                 return ResponseTemplate::new(401);
             };