mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-24 08:10:32 +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.
534 lines
17 KiB
Rust
534 lines
17 KiB
Rust
use crate::Crud;
|
|
use diesel::{dsl::*, result::Error, *};
|
|
use lemmy_db_schema::source::moderator::*;
|
|
|
|
impl Crud<ModRemovePostForm> for ModRemovePost {
|
|
fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_remove_post::dsl::*;
|
|
mod_remove_post.find(from_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, form: &ModRemovePostForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_remove_post::dsl::*;
|
|
insert_into(mod_remove_post)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(conn: &PgConnection, from_id: i32, form: &ModRemovePostForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_remove_post::dsl::*;
|
|
diesel::update(mod_remove_post.find(from_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud<ModLockPostForm> for ModLockPost {
|
|
fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_lock_post::dsl::*;
|
|
mod_lock_post.find(from_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, form: &ModLockPostForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_lock_post::dsl::*;
|
|
insert_into(mod_lock_post)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(conn: &PgConnection, from_id: i32, form: &ModLockPostForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_lock_post::dsl::*;
|
|
diesel::update(mod_lock_post.find(from_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud<ModStickyPostForm> for ModStickyPost {
|
|
fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_sticky_post::dsl::*;
|
|
mod_sticky_post.find(from_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, form: &ModStickyPostForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_sticky_post::dsl::*;
|
|
insert_into(mod_sticky_post)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(conn: &PgConnection, from_id: i32, form: &ModStickyPostForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_sticky_post::dsl::*;
|
|
diesel::update(mod_sticky_post.find(from_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud<ModRemoveCommentForm> for ModRemoveComment {
|
|
fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_remove_comment::dsl::*;
|
|
mod_remove_comment.find(from_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, form: &ModRemoveCommentForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_remove_comment::dsl::*;
|
|
insert_into(mod_remove_comment)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(conn: &PgConnection, from_id: i32, form: &ModRemoveCommentForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_remove_comment::dsl::*;
|
|
diesel::update(mod_remove_comment.find(from_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud<ModRemoveCommunityForm> for ModRemoveCommunity {
|
|
fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_remove_community::dsl::*;
|
|
mod_remove_community.find(from_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, form: &ModRemoveCommunityForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_remove_community::dsl::*;
|
|
insert_into(mod_remove_community)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(
|
|
conn: &PgConnection,
|
|
from_id: i32,
|
|
form: &ModRemoveCommunityForm,
|
|
) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_remove_community::dsl::*;
|
|
diesel::update(mod_remove_community.find(from_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud<ModBanFromCommunityForm> for ModBanFromCommunity {
|
|
fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_ban_from_community::dsl::*;
|
|
mod_ban_from_community.find(from_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, form: &ModBanFromCommunityForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_ban_from_community::dsl::*;
|
|
insert_into(mod_ban_from_community)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(
|
|
conn: &PgConnection,
|
|
from_id: i32,
|
|
form: &ModBanFromCommunityForm,
|
|
) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_ban_from_community::dsl::*;
|
|
diesel::update(mod_ban_from_community.find(from_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud<ModBanForm> for ModBan {
|
|
fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_ban::dsl::*;
|
|
mod_ban.find(from_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, form: &ModBanForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_ban::dsl::*;
|
|
insert_into(mod_ban).values(form).get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(conn: &PgConnection, from_id: i32, form: &ModBanForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_ban::dsl::*;
|
|
diesel::update(mod_ban.find(from_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud<ModAddCommunityForm> for ModAddCommunity {
|
|
fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_add_community::dsl::*;
|
|
mod_add_community.find(from_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, form: &ModAddCommunityForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_add_community::dsl::*;
|
|
insert_into(mod_add_community)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(conn: &PgConnection, from_id: i32, form: &ModAddCommunityForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_add_community::dsl::*;
|
|
diesel::update(mod_add_community.find(from_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud<ModAddForm> for ModAdd {
|
|
fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_add::dsl::*;
|
|
mod_add.find(from_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, form: &ModAddForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_add::dsl::*;
|
|
insert_into(mod_add).values(form).get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(conn: &PgConnection, from_id: i32, form: &ModAddForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::mod_add::dsl::*;
|
|
diesel::update(mod_add.find(from_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{establish_unpooled_connection, Crud, ListingType, SortType};
|
|
use lemmy_db_schema::source::{comment::*, community::*, moderator::*, post::*, user::*};
|
|
use serial_test::serial;
|
|
|
|
// use Crud;
|
|
#[test]
|
|
#[serial]
|
|
fn test_crud() {
|
|
let conn = establish_unpooled_connection();
|
|
|
|
let new_mod = UserForm {
|
|
name: "the mod".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_mod = User_::create(&conn, &new_mod).unwrap();
|
|
|
|
let new_user = UserForm {
|
|
name: "jim2".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 new_community = CommunityForm {
|
|
name: "mod_community".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 thweep".into(),
|
|
url: None,
|
|
body: None,
|
|
creator_id: inserted_user.id,
|
|
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();
|
|
|
|
// Now the actual tests
|
|
|
|
// remove post
|
|
let mod_remove_post_form = ModRemovePostForm {
|
|
mod_user_id: inserted_mod.id,
|
|
post_id: inserted_post.id,
|
|
reason: None,
|
|
removed: None,
|
|
};
|
|
let inserted_mod_remove_post = ModRemovePost::create(&conn, &mod_remove_post_form).unwrap();
|
|
let read_mod_remove_post = ModRemovePost::read(&conn, inserted_mod_remove_post.id).unwrap();
|
|
let expected_mod_remove_post = ModRemovePost {
|
|
id: inserted_mod_remove_post.id,
|
|
post_id: inserted_post.id,
|
|
mod_user_id: inserted_mod.id,
|
|
reason: None,
|
|
removed: Some(true),
|
|
when_: inserted_mod_remove_post.when_,
|
|
};
|
|
|
|
// lock post
|
|
|
|
let mod_lock_post_form = ModLockPostForm {
|
|
mod_user_id: inserted_mod.id,
|
|
post_id: inserted_post.id,
|
|
locked: None,
|
|
};
|
|
let inserted_mod_lock_post = ModLockPost::create(&conn, &mod_lock_post_form).unwrap();
|
|
let read_mod_lock_post = ModLockPost::read(&conn, inserted_mod_lock_post.id).unwrap();
|
|
let expected_mod_lock_post = ModLockPost {
|
|
id: inserted_mod_lock_post.id,
|
|
post_id: inserted_post.id,
|
|
mod_user_id: inserted_mod.id,
|
|
locked: Some(true),
|
|
when_: inserted_mod_lock_post.when_,
|
|
};
|
|
|
|
// sticky post
|
|
|
|
let mod_sticky_post_form = ModStickyPostForm {
|
|
mod_user_id: inserted_mod.id,
|
|
post_id: inserted_post.id,
|
|
stickied: None,
|
|
};
|
|
let inserted_mod_sticky_post = ModStickyPost::create(&conn, &mod_sticky_post_form).unwrap();
|
|
let read_mod_sticky_post = ModStickyPost::read(&conn, inserted_mod_sticky_post.id).unwrap();
|
|
let expected_mod_sticky_post = ModStickyPost {
|
|
id: inserted_mod_sticky_post.id,
|
|
post_id: inserted_post.id,
|
|
mod_user_id: inserted_mod.id,
|
|
stickied: Some(true),
|
|
when_: inserted_mod_sticky_post.when_,
|
|
};
|
|
|
|
// comment
|
|
|
|
let mod_remove_comment_form = ModRemoveCommentForm {
|
|
mod_user_id: inserted_mod.id,
|
|
comment_id: inserted_comment.id,
|
|
reason: None,
|
|
removed: None,
|
|
};
|
|
let inserted_mod_remove_comment =
|
|
ModRemoveComment::create(&conn, &mod_remove_comment_form).unwrap();
|
|
let read_mod_remove_comment =
|
|
ModRemoveComment::read(&conn, inserted_mod_remove_comment.id).unwrap();
|
|
let expected_mod_remove_comment = ModRemoveComment {
|
|
id: inserted_mod_remove_comment.id,
|
|
comment_id: inserted_comment.id,
|
|
mod_user_id: inserted_mod.id,
|
|
reason: None,
|
|
removed: Some(true),
|
|
when_: inserted_mod_remove_comment.when_,
|
|
};
|
|
|
|
// community
|
|
|
|
let mod_remove_community_form = ModRemoveCommunityForm {
|
|
mod_user_id: inserted_mod.id,
|
|
community_id: inserted_community.id,
|
|
reason: None,
|
|
removed: None,
|
|
expires: None,
|
|
};
|
|
let inserted_mod_remove_community =
|
|
ModRemoveCommunity::create(&conn, &mod_remove_community_form).unwrap();
|
|
let read_mod_remove_community =
|
|
ModRemoveCommunity::read(&conn, inserted_mod_remove_community.id).unwrap();
|
|
let expected_mod_remove_community = ModRemoveCommunity {
|
|
id: inserted_mod_remove_community.id,
|
|
community_id: inserted_community.id,
|
|
mod_user_id: inserted_mod.id,
|
|
reason: None,
|
|
removed: Some(true),
|
|
expires: None,
|
|
when_: inserted_mod_remove_community.when_,
|
|
};
|
|
|
|
// ban from community
|
|
|
|
let mod_ban_from_community_form = ModBanFromCommunityForm {
|
|
mod_user_id: inserted_mod.id,
|
|
other_user_id: inserted_user.id,
|
|
community_id: inserted_community.id,
|
|
reason: None,
|
|
banned: None,
|
|
expires: None,
|
|
};
|
|
let inserted_mod_ban_from_community =
|
|
ModBanFromCommunity::create(&conn, &mod_ban_from_community_form).unwrap();
|
|
let read_mod_ban_from_community =
|
|
ModBanFromCommunity::read(&conn, inserted_mod_ban_from_community.id).unwrap();
|
|
let expected_mod_ban_from_community = ModBanFromCommunity {
|
|
id: inserted_mod_ban_from_community.id,
|
|
community_id: inserted_community.id,
|
|
mod_user_id: inserted_mod.id,
|
|
other_user_id: inserted_user.id,
|
|
reason: None,
|
|
banned: Some(true),
|
|
expires: None,
|
|
when_: inserted_mod_ban_from_community.when_,
|
|
};
|
|
|
|
// ban
|
|
|
|
let mod_ban_form = ModBanForm {
|
|
mod_user_id: inserted_mod.id,
|
|
other_user_id: inserted_user.id,
|
|
reason: None,
|
|
banned: None,
|
|
expires: None,
|
|
};
|
|
let inserted_mod_ban = ModBan::create(&conn, &mod_ban_form).unwrap();
|
|
let read_mod_ban = ModBan::read(&conn, inserted_mod_ban.id).unwrap();
|
|
let expected_mod_ban = ModBan {
|
|
id: inserted_mod_ban.id,
|
|
mod_user_id: inserted_mod.id,
|
|
other_user_id: inserted_user.id,
|
|
reason: None,
|
|
banned: Some(true),
|
|
expires: None,
|
|
when_: inserted_mod_ban.when_,
|
|
};
|
|
|
|
// mod add community
|
|
|
|
let mod_add_community_form = ModAddCommunityForm {
|
|
mod_user_id: inserted_mod.id,
|
|
other_user_id: inserted_user.id,
|
|
community_id: inserted_community.id,
|
|
removed: None,
|
|
};
|
|
let inserted_mod_add_community =
|
|
ModAddCommunity::create(&conn, &mod_add_community_form).unwrap();
|
|
let read_mod_add_community =
|
|
ModAddCommunity::read(&conn, inserted_mod_add_community.id).unwrap();
|
|
let expected_mod_add_community = ModAddCommunity {
|
|
id: inserted_mod_add_community.id,
|
|
community_id: inserted_community.id,
|
|
mod_user_id: inserted_mod.id,
|
|
other_user_id: inserted_user.id,
|
|
removed: Some(false),
|
|
when_: inserted_mod_add_community.when_,
|
|
};
|
|
|
|
// mod add
|
|
|
|
let mod_add_form = ModAddForm {
|
|
mod_user_id: inserted_mod.id,
|
|
other_user_id: inserted_user.id,
|
|
removed: None,
|
|
};
|
|
let inserted_mod_add = ModAdd::create(&conn, &mod_add_form).unwrap();
|
|
let read_mod_add = ModAdd::read(&conn, inserted_mod_add.id).unwrap();
|
|
let expected_mod_add = ModAdd {
|
|
id: inserted_mod_add.id,
|
|
mod_user_id: inserted_mod.id,
|
|
other_user_id: inserted_user.id,
|
|
removed: Some(false),
|
|
when_: inserted_mod_add.when_,
|
|
};
|
|
|
|
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_mod.id).unwrap();
|
|
|
|
assert_eq!(expected_mod_remove_post, read_mod_remove_post);
|
|
assert_eq!(expected_mod_lock_post, read_mod_lock_post);
|
|
assert_eq!(expected_mod_sticky_post, read_mod_sticky_post);
|
|
assert_eq!(expected_mod_remove_comment, read_mod_remove_comment);
|
|
assert_eq!(expected_mod_remove_community, read_mod_remove_community);
|
|
assert_eq!(expected_mod_ban_from_community, read_mod_ban_from_community);
|
|
assert_eq!(expected_mod_ban, read_mod_ban);
|
|
assert_eq!(expected_mod_add_community, read_mod_add_community);
|
|
assert_eq!(expected_mod_add, read_mod_add);
|
|
}
|
|
}
|