From 93a2c6d99fcdc33634ae4c2c3111a0619c66bef7 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 9 Jan 2022 09:12:29 +0900 Subject: [PATCH] Add tests for Follow::build_accept() and build_undo() --- plume-models/src/follows.rs | 85 +++++++++++++++++++++++++++++++------ 1 file changed, 72 insertions(+), 13 deletions(-) diff --git a/plume-models/src/follows.rs b/plume-models/src/follows.rs index c7eeff44..b1e6fdaf 100644 --- a/plume-models/src/follows.rs +++ b/plume-models/src/follows.rs @@ -117,7 +117,7 @@ impl Follow { ) -> Result { let mut accept = Accept::default(); let accept_id = ap_url(&format!( - "{}/follow/{}/accept", + "{}/follows/{}/accept", CONFIG.base_url.as_str(), self.id )); @@ -235,6 +235,25 @@ mod tests { use diesel::Connection; use serde_json::{json, to_value}; + fn prepare_activity(conn: &DbConn) -> (Follow, User, User, Vec) { + let users = fill_database(conn); + let following = &users[1]; + let follower = &users[2]; + let mut follow = Follow::insert( + conn, + NewFollow { + follower_id: follower.id, + following_id: following.id, + ap_url: "".into(), + }, + ) + .unwrap(); + // following.ap_url = format!("https://plu.me/follows/{}", follow.id); + follow.ap_url = format!("https://plu.me/follows/{}", follow.id); + + (follow, following.to_owned(), follower.to_owned(), users) + } + #[test] fn test_id() { let conn = db(); @@ -273,18 +292,7 @@ mod tests { fn to_activity() { let conn = db(); conn.test_transaction::<_, Error, _>(|| { - let users = fill_database(&conn); - let following = &users[1]; - let follower = &users[2]; - let mut follow = Follow::insert( - &conn, - NewFollow { - follower_id: follower.id, - following_id: following.id, - ap_url: "".into(), - }, - )?; - follow.ap_url = format!("https://plu.me/follows/{}", follow.id); + let (follow, _following, _follower, _users) = prepare_activity(&conn); let act = follow.to_activity(&conn)?; let expected = json!({ @@ -301,4 +309,55 @@ mod tests { Ok(()) }); } + + #[test] + fn build_accept() { + let conn = db(); + conn.test_transaction::<_, Error, _>(|| { + let (follow, following, follower, _users) = prepare_activity(&conn); + let act = follow.build_accept(&follower, &following, follow.to_activity(&conn)?)?; + + let expected = json!({ + "actor": "https://plu.me/@/user/", + "cc": ["https://www.w3.org/ns/activitystreams#Public"], + "id": format!("https://127.0.0.1:7878/follows/{}/accept", follow.id), + "object": { + "actor": "https://plu.me/@/other/", + "cc": ["https://www.w3.org/ns/activitystreams#Public"], + "id": format!("https://plu.me/follows/{}", follow.id), + "object": "https://plu.me/@/user/", + "to": ["https://plu.me/@/user/"], + "type": "Follow" + }, + "to": ["https://plu.me/@/other/"], + "type": "Accept" + }); + + assert_json_eq!(to_value(act)?, expected); + + Ok(()) + }); + } + + #[test] + fn build_undo() { + let conn = db(); + conn.test_transaction::<_, Error, _>(|| { + let (follow, _following, _follower, _users) = prepare_activity(&conn); + let act = follow.build_undo(&conn)?; + + let expected = json!({ + "actor": "https://plu.me/@/other/", + "cc": ["https://www.w3.org/ns/activitystreams#Public"], + "id": format!("https://plu.me/follows/{}/undo", follow.id), + "object": format!("https://plu.me/follows/{}", follow.id), + "to": ["https://plu.me/@/user/"], + "type": "Undo" + }); + + assert_json_eq!(to_value(act)?, expected); + + Ok(()) + }); + } }