mirror of https://github.com/LemmyNet/lemmy.git
fix tests
parent
3d0d8796ad
commit
f5b1ee6c34
|
@ -1,7 +1,10 @@
|
||||||
use crate::{
|
use crate::{
|
||||||
newtypes::LocalUserId,
|
newtypes::LocalUserId,
|
||||||
schema::local_user::dsl::*,
|
schema::local_user::dsl::*,
|
||||||
source::local_user::{LocalUser, LocalUserForm},
|
source::{
|
||||||
|
local_user::{LocalUser, LocalUserForm},
|
||||||
|
local_user_language::LocalUserLanguage,
|
||||||
|
},
|
||||||
traits::Crud,
|
traits::Crud,
|
||||||
utils::naive_now,
|
utils::naive_now,
|
||||||
};
|
};
|
||||||
|
@ -115,9 +118,12 @@ impl Crud for LocalUser {
|
||||||
diesel::delete(local_user.find(local_user_id)).execute(conn)
|
diesel::delete(local_user.find(local_user_id)).execute(conn)
|
||||||
}
|
}
|
||||||
fn create(conn: &PgConnection, form: &LocalUserForm) -> Result<Self, Error> {
|
fn create(conn: &PgConnection, form: &LocalUserForm) -> Result<Self, Error> {
|
||||||
insert_into(local_user)
|
let local_user_ = insert_into(local_user)
|
||||||
.values(form)
|
.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(
|
fn update(
|
||||||
conn: &PgConnection,
|
conn: &PgConnection,
|
||||||
|
|
|
@ -5,8 +5,18 @@ use lemmy_db_schema::{
|
||||||
aggregates::structs::CommentAggregates,
|
aggregates::structs::CommentAggregates,
|
||||||
newtypes::{CommentId, CommunityId, DbUrl, LocalUserId, PersonId, PostId},
|
newtypes::{CommentId, CommunityId, DbUrl, LocalUserId, PersonId, PostId},
|
||||||
schema::{
|
schema::{
|
||||||
comment, comment_aggregates, comment_like, comment_saved, community, community_block,
|
comment,
|
||||||
community_follower, community_person_ban, language, local_user_language, person, person_block,
|
comment_aggregates,
|
||||||
|
comment_like,
|
||||||
|
comment_saved,
|
||||||
|
community,
|
||||||
|
community_block,
|
||||||
|
community_follower,
|
||||||
|
community_person_ban,
|
||||||
|
language,
|
||||||
|
local_user_language,
|
||||||
|
person,
|
||||||
|
person_block,
|
||||||
post,
|
post,
|
||||||
},
|
},
|
||||||
source::{
|
source::{
|
||||||
|
@ -19,7 +29,8 @@ use lemmy_db_schema::{
|
||||||
},
|
},
|
||||||
traits::{ToSafe, ViewToVec},
|
traits::{ToSafe, ViewToVec},
|
||||||
utils::{functions::hot_rank, fuzzy_search, limit_and_offset_unlimited},
|
utils::{functions::hot_rank, fuzzy_search, limit_and_offset_unlimited},
|
||||||
CommentSortType, ListingType,
|
CommentSortType,
|
||||||
|
ListingType,
|
||||||
};
|
};
|
||||||
use typed_builder::TypedBuilder;
|
use typed_builder::TypedBuilder;
|
||||||
|
|
||||||
|
@ -378,8 +389,12 @@ mod tests {
|
||||||
aggregates::structs::CommentAggregates,
|
aggregates::structs::CommentAggregates,
|
||||||
newtypes::LanguageId,
|
newtypes::LanguageId,
|
||||||
source::{
|
source::{
|
||||||
comment::*, community::*, local_user::LocalUserForm, person::*,
|
comment::*,
|
||||||
person_block::PersonBlockForm, post::*,
|
community::*,
|
||||||
|
local_user::LocalUserForm,
|
||||||
|
person::*,
|
||||||
|
person_block::PersonBlockForm,
|
||||||
|
post::*,
|
||||||
},
|
},
|
||||||
traits::{Blockable, Crud, Likeable},
|
traits::{Blockable, Crud, Likeable},
|
||||||
utils::establish_unpooled_connection,
|
utils::establish_unpooled_connection,
|
||||||
|
@ -519,6 +534,15 @@ mod tests {
|
||||||
};
|
};
|
||||||
assert_eq!(expected_block, inserted_block);
|
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 {
|
Data {
|
||||||
inserted_comment_0,
|
inserted_comment_0,
|
||||||
inserted_comment_1,
|
inserted_comment_1,
|
||||||
|
@ -537,15 +561,6 @@ mod tests {
|
||||||
let conn = establish_unpooled_connection();
|
let conn = establish_unpooled_connection();
|
||||||
let data = init_data(&conn);
|
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 expected_comment_view_no_person = expected_comment_view(&data, &conn);
|
||||||
|
|
||||||
let mut expected_comment_view_with_person = expected_comment_view_no_person.to_owned();
|
let mut expected_comment_view_with_person = expected_comment_view_no_person.to_owned();
|
||||||
|
|
|
@ -477,8 +477,6 @@ mod tests {
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
let inserted_local_user = LocalUser::create(conn, &local_user_form).unwrap();
|
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 {
|
let new_bot = PersonForm {
|
||||||
name: "mybot".to_string(),
|
name: "mybot".to_string(),
|
||||||
|
|
|
@ -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
|
# so to load the config we need to traverse to the repo root
|
||||||
export LEMMY_CONFIG_LOCATION=../../config/config.hjson
|
export LEMMY_CONFIG_LOCATION=../../config/config.hjson
|
||||||
RUST_BACKTRACE=1 \
|
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
|
# Add this to do printlns: -- --nocapture
|
||||||
|
|
Loading…
Reference in New Issue