X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Fobjects%2Fperson.rs;h=b1a892a321244ee9788ea732b98f5977e00eef62;hb=c9f140742925d6da20103124b49f2b58a35fc2b8;hp=0b1dd84de2a7ee3752cdea0ceecd8022a129cf6c;hpb=4e6409f325bca5b2727b19c24d77ffa2b59109b1;p=lemmy.git diff --git a/crates/apub/src/objects/person.rs b/crates/apub/src/objects/person.rs index 0b1dd84d..b1a892a3 100644 --- a/crates/apub/src/objects/person.rs +++ b/crates/apub/src/objects/person.rs @@ -32,7 +32,7 @@ use lemmy_websocket::LemmyContext; use std::ops::Deref; use url::Url; -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct ApubPerson(DbPerson); impl Deref for ApubPerson { @@ -230,20 +230,22 @@ pub(crate) mod tests { #[serial] async fn test_parse_lemmy_person() { let context = init_context(); + let conn = &mut context.pool().get().unwrap(); let (person, site) = parse_lemmy_person(&context).await; assert_eq!(person.display_name, Some("Jean-Luc Picard".to_string())); assert!(!person.local); assert_eq!(person.bio.as_ref().unwrap().len(), 39); - DbPerson::delete(&*context.pool().get().unwrap(), person.id).unwrap(); - Site::delete(&*context.pool().get().unwrap(), site.id).unwrap(); + DbPerson::delete(conn, person.id).unwrap(); + Site::delete(conn, site.id).unwrap(); } #[actix_rt::test] #[serial] async fn test_parse_pleroma_person() { let context = init_context(); + let conn = &mut context.pool().get().unwrap(); // create and parse a fake pleroma instance actor, to avoid network request during test let mut json: Instance = file_to_json_object("assets/lemmy/objects/instance.json").unwrap(); @@ -270,7 +272,7 @@ pub(crate) mod tests { assert_eq!(request_counter, 0); assert_eq!(person.bio.as_ref().unwrap().len(), 873); - DbPerson::delete(&*context.pool().get().unwrap(), person.id).unwrap(); - Site::delete(&*context.pool().get().unwrap(), site.id).unwrap(); + DbPerson::delete(conn, person.id).unwrap(); + Site::delete(conn, site.id).unwrap(); } }