mirror of
https://github.com/discourse/discourse.git
synced 2025-03-28 17:55:37 +08:00
FIX: TopicTrackingState.report
not including unread for staff posts.
Follow-up to e15c86e8c5ff9fcb8aec32d3bab641c2ab4193a9
This commit is contained in:
parent
2fb17b7b17
commit
9a60c83535
@ -385,7 +385,7 @@ class TopicTrackingState
|
|||||||
if skip_unread
|
if skip_unread
|
||||||
"1=0"
|
"1=0"
|
||||||
else
|
else
|
||||||
unread_filter_sql
|
unread_filter_sql(staff: staff)
|
||||||
end
|
end
|
||||||
|
|
||||||
filter_old_unread_sql =
|
filter_old_unread_sql =
|
||||||
|
@ -688,4 +688,27 @@ describe TopicTrackingState do
|
|||||||
expect(TopicTrackingState.report(post.user)).to be_empty
|
expect(TopicTrackingState.report(post.user)).to be_empty
|
||||||
expect(TopicTrackingState.report(user)).to be_empty
|
expect(TopicTrackingState.report(user)).to be_empty
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe ".report" do
|
||||||
|
it "correctly reports topics with staff posts" do
|
||||||
|
create_post(
|
||||||
|
raw: "this is a test post",
|
||||||
|
topic: topic,
|
||||||
|
user: post.user
|
||||||
|
)
|
||||||
|
|
||||||
|
create_post(
|
||||||
|
raw: "this is a test post",
|
||||||
|
topic: topic,
|
||||||
|
post_type: Post.types[:whisper],
|
||||||
|
user: user
|
||||||
|
)
|
||||||
|
|
||||||
|
post.user.grant_admin!
|
||||||
|
|
||||||
|
state = TopicTrackingState.report(post.user)
|
||||||
|
|
||||||
|
expect(state.map(&:topic_id)).to contain_exactly(topic.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user