mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-01 08:38:05 +00:00
600ae662a5
Since DB tests execute diesel migrations automatically, concurrent execution causes flaky failures from simultaneous migrations. This can be worked around using `cargo test --workspace -- --test-threads=1`, which is what the CI config does, but this is not intuitive for newcomer developers and unnecessarily slows down the test suite for the majority of tests which are safe to run concurrently. This fixes this issue by integrating with the small test crate `serial_test` and using it to explicitly mark DB tests to run sequentially while allowing all other tests to run in parallel. Additionally, this greatly improves the speed of `cargo test` by disabling doc-tests in all crates, since these are aren't currently used and cargo's doc-test pass, even when no doc-tests exist, has significant overhead. On my machine, this change significantly improves test suite times by about 85%, making it much more practical to develop with tools like `cargo watch` auto-running tests.
246 lines
6.7 KiB
Rust
246 lines
6.7 KiB
Rust
use crate::Crud;
|
|
use diesel::{dsl::*, result::Error, *};
|
|
use lemmy_db_schema::source::user_mention::*;
|
|
|
|
impl Crud<UserMentionForm> for UserMention {
|
|
fn read(conn: &PgConnection, user_mention_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::user_mention::dsl::*;
|
|
user_mention.find(user_mention_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, user_mention_form: &UserMentionForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::user_mention::dsl::*;
|
|
// since the return here isnt utilized, we dont need to do an update
|
|
// but get_result doesnt return the existing row here
|
|
insert_into(user_mention)
|
|
.values(user_mention_form)
|
|
.on_conflict((recipient_id, comment_id))
|
|
.do_update()
|
|
.set(user_mention_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(
|
|
conn: &PgConnection,
|
|
user_mention_id: i32,
|
|
user_mention_form: &UserMentionForm,
|
|
) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::user_mention::dsl::*;
|
|
diesel::update(user_mention.find(user_mention_id))
|
|
.set(user_mention_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
pub trait UserMention_ {
|
|
fn update_read(
|
|
conn: &PgConnection,
|
|
user_mention_id: i32,
|
|
new_read: bool,
|
|
) -> Result<UserMention, Error>;
|
|
fn mark_all_as_read(
|
|
conn: &PgConnection,
|
|
for_recipient_id: i32,
|
|
) -> Result<Vec<UserMention>, Error>;
|
|
}
|
|
|
|
impl UserMention_ for UserMention {
|
|
fn update_read(
|
|
conn: &PgConnection,
|
|
user_mention_id: i32,
|
|
new_read: bool,
|
|
) -> Result<UserMention, Error> {
|
|
use lemmy_db_schema::schema::user_mention::dsl::*;
|
|
diesel::update(user_mention.find(user_mention_id))
|
|
.set(read.eq(new_read))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn mark_all_as_read(
|
|
conn: &PgConnection,
|
|
for_recipient_id: i32,
|
|
) -> Result<Vec<UserMention>, Error> {
|
|
use lemmy_db_schema::schema::user_mention::dsl::*;
|
|
diesel::update(
|
|
user_mention
|
|
.filter(recipient_id.eq(for_recipient_id))
|
|
.filter(read.eq(false)),
|
|
)
|
|
.set(read.eq(true))
|
|
.get_results::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{establish_unpooled_connection, Crud, ListingType, SortType};
|
|
use lemmy_db_schema::source::{
|
|
comment::*,
|
|
community::{Community, CommunityForm},
|
|
post::*,
|
|
user::*,
|
|
user_mention::*,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[test]
|
|
#[serial]
|
|
fn test_crud() {
|
|
let conn = establish_unpooled_connection();
|
|
|
|
let new_user = UserForm {
|
|
name: "terrylake".into(),
|
|
preferred_username: None,
|
|
password_encrypted: "nope".into(),
|
|
email: None,
|
|
matrix_user_id: None,
|
|
avatar: None,
|
|
banner: None,
|
|
admin: false,
|
|
banned: Some(false),
|
|
published: None,
|
|
updated: None,
|
|
show_nsfw: false,
|
|
theme: "browser".into(),
|
|
default_sort_type: SortType::Hot as i16,
|
|
default_listing_type: ListingType::Subscribed as i16,
|
|
lang: "browser".into(),
|
|
show_avatars: true,
|
|
send_notifications_to_email: false,
|
|
actor_id: None,
|
|
bio: None,
|
|
local: true,
|
|
private_key: None,
|
|
public_key: None,
|
|
last_refreshed_at: None,
|
|
inbox_url: None,
|
|
shared_inbox_url: None,
|
|
};
|
|
|
|
let inserted_user = User_::create(&conn, &new_user).unwrap();
|
|
|
|
let recipient_form = UserForm {
|
|
name: "terrylakes recipient".into(),
|
|
preferred_username: None,
|
|
password_encrypted: "nope".into(),
|
|
email: None,
|
|
matrix_user_id: None,
|
|
avatar: None,
|
|
banner: None,
|
|
admin: false,
|
|
banned: Some(false),
|
|
published: None,
|
|
updated: None,
|
|
show_nsfw: false,
|
|
theme: "browser".into(),
|
|
default_sort_type: SortType::Hot as i16,
|
|
default_listing_type: ListingType::Subscribed as i16,
|
|
lang: "browser".into(),
|
|
show_avatars: true,
|
|
send_notifications_to_email: false,
|
|
actor_id: None,
|
|
bio: None,
|
|
local: true,
|
|
private_key: None,
|
|
public_key: None,
|
|
last_refreshed_at: None,
|
|
inbox_url: None,
|
|
shared_inbox_url: None,
|
|
};
|
|
|
|
let inserted_recipient = User_::create(&conn, &recipient_form).unwrap();
|
|
|
|
let new_community = CommunityForm {
|
|
name: "test community lake".to_string(),
|
|
title: "nada".to_owned(),
|
|
description: None,
|
|
creator_id: inserted_user.id,
|
|
removed: None,
|
|
deleted: None,
|
|
updated: None,
|
|
nsfw: false,
|
|
actor_id: None,
|
|
local: true,
|
|
private_key: None,
|
|
public_key: None,
|
|
last_refreshed_at: None,
|
|
published: None,
|
|
icon: None,
|
|
banner: None,
|
|
followers_url: None,
|
|
inbox_url: None,
|
|
shared_inbox_url: None,
|
|
};
|
|
|
|
let inserted_community = Community::create(&conn, &new_community).unwrap();
|
|
|
|
let new_post = PostForm {
|
|
name: "A test post".into(),
|
|
creator_id: inserted_user.id,
|
|
url: None,
|
|
body: None,
|
|
community_id: inserted_community.id,
|
|
removed: None,
|
|
deleted: None,
|
|
locked: None,
|
|
stickied: None,
|
|
updated: None,
|
|
nsfw: false,
|
|
embed_title: None,
|
|
embed_description: None,
|
|
embed_html: None,
|
|
thumbnail_url: None,
|
|
ap_id: None,
|
|
local: true,
|
|
published: None,
|
|
};
|
|
|
|
let inserted_post = Post::create(&conn, &new_post).unwrap();
|
|
|
|
let comment_form = CommentForm {
|
|
content: "A test comment".into(),
|
|
creator_id: inserted_user.id,
|
|
post_id: inserted_post.id,
|
|
removed: None,
|
|
deleted: None,
|
|
read: None,
|
|
parent_id: None,
|
|
published: None,
|
|
updated: None,
|
|
ap_id: None,
|
|
local: true,
|
|
};
|
|
|
|
let inserted_comment = Comment::create(&conn, &comment_form).unwrap();
|
|
|
|
let user_mention_form = UserMentionForm {
|
|
recipient_id: inserted_recipient.id,
|
|
comment_id: inserted_comment.id,
|
|
read: None,
|
|
};
|
|
|
|
let inserted_mention = UserMention::create(&conn, &user_mention_form).unwrap();
|
|
|
|
let expected_mention = UserMention {
|
|
id: inserted_mention.id,
|
|
recipient_id: inserted_mention.recipient_id,
|
|
comment_id: inserted_mention.comment_id,
|
|
read: false,
|
|
published: inserted_mention.published,
|
|
};
|
|
|
|
let read_mention = UserMention::read(&conn, inserted_mention.id).unwrap();
|
|
let updated_mention =
|
|
UserMention::update(&conn, inserted_mention.id, &user_mention_form).unwrap();
|
|
Comment::delete(&conn, inserted_comment.id).unwrap();
|
|
Post::delete(&conn, inserted_post.id).unwrap();
|
|
Community::delete(&conn, inserted_community.id).unwrap();
|
|
User_::delete(&conn, inserted_user.id).unwrap();
|
|
User_::delete(&conn, inserted_recipient.id).unwrap();
|
|
|
|
assert_eq!(expected_mention, read_mention);
|
|
assert_eq!(expected_mention, inserted_mention);
|
|
assert_eq!(expected_mention, updated_mention);
|
|
}
|
|
}
|