fix test

kitsune-soc · Oct 25, 2023 · 65e489d · 65e489d
1 parent 0a6628c
commit 65e489d
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/kitsune-core/src/activitypub/fetcher.rs b/crates/kitsune-core/src/activitypub/fetcher.rs
@@ -363,7 +363,7 @@ mod test {
     use kitsune_db::{model::account::Account, schema::accounts};
     use kitsune_http_client::Client;
     use kitsune_search::NoopSearchService;
-    use kitsune_test::database_test;
+    use kitsune_test::{build_ap_response, database_test};
     use kitsune_type::{
         ap::{
             actor::{Actor, ActorType, PublicKey},
@@ -612,6 +612,7 @@ mod test {
             let client = service_fn(move |req: Request<_>| {
                 let count = request_counter.fetch_add(1, Ordering::SeqCst);
                 assert!(MAX_FETCH_DEPTH * 3 >= count);
+
                 async move {
                     let author_id = "https://example.com/users/1".to_owned();
                     let author = Actor {
@@ -658,11 +659,14 @@ mod test {
                             to: vec![PUBLIC_IDENTIFIER.into()],
                             cc: Vec::new(),
                         };
+
                         let body = simd_json::to_string(&note).unwrap();
-                        Ok::<_, Infallible>(Response::new(Body::from(body)))
+
+                        Ok::<_, Infallible>(build_ap_response!(body))
                     } else if req.uri().path_and_query().unwrap() == Uri::try_from(&author.id).unwrap().path_and_query().unwrap() {
                         let body = simd_json::to_string(&author).unwrap();
-                        Ok::<_, Infallible>(Response::new(Body::from(body)))
+
+                        Ok::<_, Infallible>(build_ap_response!(body))
                     } else {
                         handle(req).await
                     }
@@ -886,15 +890,6 @@ mod test {
     }
 
     async fn handle(req: Request<Body>) -> Result<Response<Body>, Infallible> {
-        macro_rules! build_ap_response {
-            ($body:expr) => {
-                Response::builder()
-                    .header("Content-Type", "application/activity+json")
-                    .body(Body::from($body))
-                    .unwrap()
-            };
-        }
-
         match req.uri().path_and_query().unwrap().as_str() {
             "/users/0x0" => {
                 let body = include_str!("../../../../test-fixtures/0x0_actor.json");

diff --git a/crates/kitsune-core/src/resolve/post.rs b/crates/kitsune-core/src/resolve/post.rs
@@ -96,7 +96,7 @@ mod test {
     use kitsune_http_client::Client;
     use kitsune_search::NoopSearchService;
     use kitsune_storage::fs::Storage as FsStorage;
-    use kitsune_test::{database_test, redis_test};
+    use kitsune_test::{build_ap_response, database_test, redis_test};
     use pretty_assertions::assert_eq;
     use scoped_futures::ScopedFutureExt;
     use std::sync::Arc;
@@ -117,7 +117,7 @@ mod test {
                         }
                         "/users/0x0" => {
                             let body = include_str!("../../../../test-fixtures/0x0_actor.json");
-                            Ok::<_, Infallible>(Response::new(Body::from(body)))
+                            Ok::<_, Infallible>(build_ap_response!(body))
                         }
                         path => panic!("HTTP client hit unexpected route: {path}"),
                     }

diff --git a/crates/kitsune-test/Cargo.toml b/crates/kitsune-test/Cargo.toml
@@ -8,6 +8,7 @@ deadpool-redis = "0.13.0"
 diesel = "2.1.3"
 diesel-async = "0.4.1"
 futures-util = "0.3.28"
+http = "0.2.9"
 kitsune-db = { path = "../kitsune-db" }
 pin-project-lite = "0.2.13"
 redis = "0.23.3"

diff --git a/crates/kitsune-test/src/lib.rs b/crates/kitsune-test/src/lib.rs
@@ -11,8 +11,21 @@ use std::{env, error::Error, panic};
 
 mod catch_panic;
 
+#[doc(hidden)]
+pub use http;
+
 type BoxError = Box<dyn Error + Send + Sync>;
 
+#[macro_export]
+macro_rules! build_ap_response {
+    ($body:expr) => {
+        $crate::http::Response::builder()
+            .header("Content-Type", "application/activity+json")
+            .body(Body::from($body))
+            .unwrap()
+    };
+}
+
 pub async fn database_test<F, Fut>(func: F) -> Fut::Output
 where
     F: FnOnce(PgPool) -> Fut,