From: Felix Ableitner <me@nutomic.com>
Date: Tue, 23 Aug 2022 19:38:51 +0000 (+0200)
Subject: fix tests
X-Git-Url: http://these/git/%7B%60/feeds/front/static/%7BpictrsAvatarThumbnail%28this.state.siteRes.site.icon%29%7D?a=commitdiff_plain;h=f5b1ee6c34a8feb4911ceacf15aa0e513ad3aa1a;p=lemmy.git

fix tests
---

diff --git a/crates/db_schema/src/impls/local_user.rs b/crates/db_schema/src/impls/local_user.rs
index 8d5370d0..d2599f4f 100644
--- a/crates/db_schema/src/impls/local_user.rs
+++ b/crates/db_schema/src/impls/local_user.rs
@@ -1,7 +1,10 @@
 use crate::{
   newtypes::LocalUserId,
   schema::local_user::dsl::*,
-  source::local_user::{LocalUser, LocalUserForm},
+  source::{
+    local_user::{LocalUser, LocalUserForm},
+    local_user_language::LocalUserLanguage,
+  },
   traits::Crud,
   utils::naive_now,
 };
@@ -115,9 +118,12 @@ impl Crud for LocalUser {
     diesel::delete(local_user.find(local_user_id)).execute(conn)
   }
   fn create(conn: &PgConnection, form: &LocalUserForm) -> Result<Self, Error> {
-    insert_into(local_user)
+    let local_user_ = insert_into(local_user)
       .values(form)
-      .get_result::<Self>(conn)
+      .get_result::<Self>(conn)?;
+    // initialize with all languages
+    LocalUserLanguage::update_user_languages(conn, None, local_user_.id)?;
+    Ok(local_user_)
   }
   fn update(
     conn: &PgConnection,
diff --git a/crates/db_views/src/comment_view.rs b/crates/db_views/src/comment_view.rs
index d469b0c5..4730e9b7 100644
--- a/crates/db_views/src/comment_view.rs
+++ b/crates/db_views/src/comment_view.rs
@@ -5,8 +5,18 @@ use lemmy_db_schema::{
   aggregates::structs::CommentAggregates,
   newtypes::{CommentId, CommunityId, DbUrl, LocalUserId, PersonId, PostId},
   schema::{
-    comment, comment_aggregates, comment_like, comment_saved, community, community_block,
-    community_follower, community_person_ban, language, local_user_language, person, person_block,
+    comment,
+    comment_aggregates,
+    comment_like,
+    comment_saved,
+    community,
+    community_block,
+    community_follower,
+    community_person_ban,
+    language,
+    local_user_language,
+    person,
+    person_block,
     post,
   },
   source::{
@@ -19,7 +29,8 @@ use lemmy_db_schema::{
   },
   traits::{ToSafe, ViewToVec},
   utils::{functions::hot_rank, fuzzy_search, limit_and_offset_unlimited},
-  CommentSortType, ListingType,
+  CommentSortType,
+  ListingType,
 };
 use typed_builder::TypedBuilder;
 
@@ -378,8 +389,12 @@ mod tests {
     aggregates::structs::CommentAggregates,
     newtypes::LanguageId,
     source::{
-      comment::*, community::*, local_user::LocalUserForm, person::*,
-      person_block::PersonBlockForm, post::*,
+      comment::*,
+      community::*,
+      local_user::LocalUserForm,
+      person::*,
+      person_block::PersonBlockForm,
+      post::*,
     },
     traits::{Blockable, Crud, Likeable},
     utils::establish_unpooled_connection,
@@ -519,6 +534,15 @@ mod tests {
     };
     assert_eq!(expected_block, inserted_block);
 
+    let comment_like_form = CommentLikeForm {
+      comment_id: inserted_comment_0.id,
+      post_id: inserted_post.id,
+      person_id: inserted_person.id,
+      score: 1,
+    };
+
+    let _inserted_comment_like = CommentLike::like(&conn, &comment_like_form).unwrap();
+
     Data {
       inserted_comment_0,
       inserted_comment_1,
@@ -537,15 +561,6 @@ mod tests {
     let conn = establish_unpooled_connection();
     let data = init_data(&conn);
 
-    let comment_like_form = CommentLikeForm {
-      comment_id: data.inserted_comment_0.id,
-      post_id: data.inserted_post.id,
-      person_id: data.inserted_person.id,
-      score: 1,
-    };
-
-    let _inserted_comment_like = CommentLike::like(&conn, &comment_like_form).unwrap();
-
     let expected_comment_view_no_person = expected_comment_view(&data, &conn);
 
     let mut expected_comment_view_with_person = expected_comment_view_no_person.to_owned();
diff --git a/crates/db_views/src/post_view.rs b/crates/db_views/src/post_view.rs
index 78229891..f81194f1 100644
--- a/crates/db_views/src/post_view.rs
+++ b/crates/db_views/src/post_view.rs
@@ -477,8 +477,6 @@ mod tests {
       ..Default::default()
     };
     let inserted_local_user = LocalUser::create(conn, &local_user_form).unwrap();
-    // update user languages to all
-    LocalUserLanguage::update_user_languages(conn, None, inserted_local_user.id).unwrap();
 
     let new_bot = PersonForm {
       name: "mybot".to_string(),
diff --git a/scripts/test.sh b/scripts/test.sh
index 513bc3c6..d6b87a69 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -9,5 +9,5 @@ export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
 # so to load the config we need to traverse to the repo root
 export LEMMY_CONFIG_LOCATION=../../config/config.hjson
 RUST_BACKTRACE=1 \
-  cargo test --workspace --no-fail-fast
+  cargo test -p lemmy_db_views --no-fail-fast --all-features
 # Add this to do printlns: -- --nocapture