From: nutomic <nutomic@noreply.yerbamate.dev>
Date: Mon, 17 Aug 2020 20:50:44 +0000 (+0000)
Subject: Remove tests for unimplemented Crud::delete functions (#87)
X-Git-Url: http://these/git/%22/display/44b525e5-4101b003e005e70a-d472d963/static/readmes/%7BinboxRss%7D?a=commitdiff_plain;h=ed72b096b97eea61f2f60cda99e11be1f80f5c49;p=lemmy.git

Remove tests for unimplemented Crud::delete functions (#87)

Remove tests for unimplemented Crud::delete functions

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/87
---

diff --git a/server/lemmy_db/src/activity.rs b/server/lemmy_db/src/activity.rs
index a8323342..177e6b7c 100644
--- a/server/lemmy_db/src/activity.rs
+++ b/server/lemmy_db/src/activity.rs
@@ -151,11 +151,9 @@ mod tests {
     };
 
     let read_activity = Activity::read(&conn, inserted_activity.id).unwrap();
-    let num_deleted = Activity::delete(&conn, inserted_activity.id).unwrap();
     User_::delete(&conn, inserted_creator.id).unwrap();
 
     assert_eq!(expected_activity, read_activity);
     assert_eq!(expected_activity, inserted_activity);
-    assert_eq!(1, num_deleted);
   }
 }
diff --git a/server/lemmy_db/src/comment.rs b/server/lemmy_db/src/comment.rs
index 8e52d7e2..8171f6b8 100644
--- a/server/lemmy_db/src/comment.rs
+++ b/server/lemmy_db/src/comment.rs
@@ -149,10 +149,7 @@ impl Comment {
       .get_result::<Self>(conn)
   }
 
-  pub fn upsert(
-    conn: &PgConnection,
-    comment_form: &CommentForm,
-  ) -> Result<Self, Error> {
+  pub fn upsert(conn: &PgConnection, comment_form: &CommentForm) -> Result<Self, Error> {
     let existing = Self::read_from_apub_id(conn, &comment_form.ap_id);
     match existing {
       Err(NotFound {}) => Ok(Self::create(conn, &comment_form)?),
diff --git a/server/lemmy_db/src/community_view.rs b/server/lemmy_db/src/community_view.rs
index 1d47c7d7..e8353779 100644
--- a/server/lemmy_db/src/community_view.rs
+++ b/server/lemmy_db/src/community_view.rs
@@ -251,7 +251,7 @@ impl<'a> CommunityQueryBuilder<'a> {
           .order_by(hot_rank.desc())
           .then_order_by(number_of_subscribers.desc())
           .filter(user_id.is_null())
-      },
+      }
     };
 
     if !self.show_nsfw {
diff --git a/server/lemmy_db/src/moderator.rs b/server/lemmy_db/src/moderator.rs
index 70c253fe..1a02d977 100644
--- a/server/lemmy_db/src/moderator.rs
+++ b/server/lemmy_db/src/moderator.rs
@@ -707,16 +707,6 @@ mod tests {
       when_: inserted_mod_add.when_,
     };
 
-    ModRemovePost::delete(&conn, inserted_mod_remove_post.id).unwrap();
-    ModLockPost::delete(&conn, inserted_mod_lock_post.id).unwrap();
-    ModStickyPost::delete(&conn, inserted_mod_sticky_post.id).unwrap();
-    ModRemoveComment::delete(&conn, inserted_mod_remove_comment.id).unwrap();
-    ModRemoveCommunity::delete(&conn, inserted_mod_remove_community.id).unwrap();
-    ModBanFromCommunity::delete(&conn, inserted_mod_ban_from_community.id).unwrap();
-    ModBan::delete(&conn, inserted_mod_ban.id).unwrap();
-    ModAddCommunity::delete(&conn, inserted_mod_add_community.id).unwrap();
-    ModAdd::delete(&conn, inserted_mod_add.id).unwrap();
-
     Comment::delete(&conn, inserted_comment.id).unwrap();
     Post::delete(&conn, inserted_post.id).unwrap();
     Community::delete(&conn, inserted_community.id).unwrap();
diff --git a/server/lemmy_db/src/private_message.rs b/server/lemmy_db/src/private_message.rs
index 16c6f9bf..007a9620 100644
--- a/server/lemmy_db/src/private_message.rs
+++ b/server/lemmy_db/src/private_message.rs
@@ -225,7 +225,6 @@ mod tests {
       PrivateMessage::update_deleted(&conn, inserted_private_message.id, true).unwrap();
     let marked_read_private_message =
       PrivateMessage::update_read(&conn, inserted_private_message.id, true).unwrap();
-    let num_deleted = PrivateMessage::delete(&conn, inserted_private_message.id).unwrap();
     User_::delete(&conn, inserted_creator.id).unwrap();
     User_::delete(&conn, inserted_recipient.id).unwrap();
 
@@ -234,6 +233,5 @@ mod tests {
     assert_eq!(expected_private_message, inserted_private_message);
     assert!(deleted_private_message.deleted);
     assert!(marked_read_private_message.read);
-    assert_eq!(1, num_deleted);
   }
 }
diff --git a/server/lemmy_db/src/user_mention.rs b/server/lemmy_db/src/user_mention.rs
index a8ec88d2..4c0fdc5f 100644
--- a/server/lemmy_db/src/user_mention.rs
+++ b/server/lemmy_db/src/user_mention.rs
@@ -224,7 +224,6 @@ mod tests {
     let read_mention = UserMention::read(&conn, inserted_mention.id).unwrap();
     let updated_mention =
       UserMention::update(&conn, inserted_mention.id, &user_mention_form).unwrap();
-    let num_deleted = UserMention::delete(&conn, inserted_mention.id).unwrap();
     Comment::delete(&conn, inserted_comment.id).unwrap();
     Post::delete(&conn, inserted_post.id).unwrap();
     Community::delete(&conn, inserted_community.id).unwrap();
@@ -234,6 +233,5 @@ mod tests {
     assert_eq!(expected_mention, read_mention);
     assert_eq!(expected_mention, inserted_mention);
     assert_eq!(expected_mention, updated_mention);
-    assert_eq!(1, num_deleted);
   }
 }