mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-23 11:21:32 +00:00
Add test for fixed deleted post filter (#4256)
* Add test for fixed deleted post filter * fmt * Fmt * Update post_view.rs
This commit is contained in:
parent
a0ef56b9b7
commit
5e589004a5
1 changed files with 32 additions and 28 deletions
|
@ -766,7 +766,7 @@ mod tests {
|
||||||
struct Data {
|
struct Data {
|
||||||
inserted_instance: Instance,
|
inserted_instance: Instance,
|
||||||
local_user_view: LocalUserView,
|
local_user_view: LocalUserView,
|
||||||
inserted_blocked_person: Person,
|
blocked_local_user_view: LocalUserView,
|
||||||
inserted_bot: Person,
|
inserted_bot: Person,
|
||||||
inserted_community: Community,
|
inserted_community: Community,
|
||||||
inserted_post: Post,
|
inserted_post: Post,
|
||||||
|
@ -822,6 +822,14 @@ mod tests {
|
||||||
|
|
||||||
let inserted_blocked_person = Person::create(pool, &blocked_person).await.unwrap();
|
let inserted_blocked_person = Person::create(pool, &blocked_person).await.unwrap();
|
||||||
|
|
||||||
|
let blocked_local_user_form = LocalUserInsertForm::builder()
|
||||||
|
.person_id(inserted_blocked_person.id)
|
||||||
|
.password_encrypted(String::new())
|
||||||
|
.build();
|
||||||
|
let inserted_blocked_local_user = LocalUser::create(pool, &blocked_local_user_form)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
let post_from_blocked_person = PostInsertForm::builder()
|
let post_from_blocked_person = PostInsertForm::builder()
|
||||||
.name("blocked_person_post".to_string())
|
.name("blocked_person_post".to_string())
|
||||||
.creator_id(inserted_blocked_person.id)
|
.creator_id(inserted_blocked_person.id)
|
||||||
|
@ -861,11 +869,16 @@ mod tests {
|
||||||
person: inserted_person,
|
person: inserted_person,
|
||||||
counts: Default::default(),
|
counts: Default::default(),
|
||||||
};
|
};
|
||||||
|
let blocked_local_user_view = LocalUserView {
|
||||||
|
local_user: inserted_blocked_local_user,
|
||||||
|
person: inserted_blocked_person,
|
||||||
|
counts: Default::default(),
|
||||||
|
};
|
||||||
|
|
||||||
Data {
|
Data {
|
||||||
inserted_instance,
|
inserted_instance,
|
||||||
local_user_view,
|
local_user_view,
|
||||||
inserted_blocked_person,
|
blocked_local_user_view,
|
||||||
inserted_bot,
|
inserted_bot,
|
||||||
inserted_community,
|
inserted_community,
|
||||||
inserted_post,
|
inserted_post,
|
||||||
|
@ -1317,34 +1330,25 @@ mod tests {
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
// Make sure you don't see the deleted post in the results
|
// Deleted post is only shown to creator
|
||||||
let post_listings_no_creator = PostQuery {
|
for (local_user, expect_contains_deleted) in [
|
||||||
sort: Some(SortType::New),
|
(None, false),
|
||||||
..Default::default()
|
(Some(&data.blocked_local_user_view), false),
|
||||||
}
|
(Some(&data.local_user_view), true),
|
||||||
.list(pool)
|
] {
|
||||||
.await
|
let contains_deleted = PostQuery {
|
||||||
.unwrap();
|
sort: Some(SortType::New),
|
||||||
let not_contains_deleted = post_listings_no_creator
|
local_user,
|
||||||
|
..Default::default()
|
||||||
|
}
|
||||||
|
.list(pool)
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
.iter()
|
.iter()
|
||||||
.map(|p| p.post.id)
|
.any(|p| p.post.id == data.inserted_post.id);
|
||||||
.all(|p| p != data.inserted_post.id);
|
|
||||||
assert!(not_contains_deleted);
|
|
||||||
|
|
||||||
// Deleted post is shown to creator
|
assert_eq!(expect_contains_deleted, contains_deleted);
|
||||||
let post_listings_is_creator = PostQuery {
|
|
||||||
sort: Some(SortType::New),
|
|
||||||
local_user: Some(&data.local_user_view),
|
|
||||||
..Default::default()
|
|
||||||
}
|
}
|
||||||
.list(pool)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
let contains_deleted = post_listings_is_creator
|
|
||||||
.iter()
|
|
||||||
.map(|p| p.post.id)
|
|
||||||
.any(|p| p == data.inserted_post.id);
|
|
||||||
assert!(contains_deleted);
|
|
||||||
|
|
||||||
cleanup(data, pool).await;
|
cleanup(data, pool).await;
|
||||||
}
|
}
|
||||||
|
@ -1436,7 +1440,7 @@ mod tests {
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
Person::delete(pool, data.inserted_bot.id).await.unwrap();
|
Person::delete(pool, data.inserted_bot.id).await.unwrap();
|
||||||
Person::delete(pool, data.inserted_blocked_person.id)
|
Person::delete(pool, data.blocked_local_user_view.person.id)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
Instance::delete(pool, data.inserted_instance.id)
|
Instance::delete(pool, data.inserted_instance.id)
|
||||||
|
|
Loading…
Reference in a new issue