IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 18:24:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: reset bump date resets bumped_at to the last regular post in topic (#6605)

Browse Source
This commit is contained in:
Maja Komel 2018-11-14 18:56:22 +01:00 committed by Régis Hanol
parent 20899654aa
commit c701036034
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/topic.rb
View File

@ -1390,7 +1390,7 @@ class Topic < ActiveRecord::Base
post = ordered_posts.where(
user_deleted: false,
hidden: false,
post_type: Topic.visible_post_types
post_type: Post.types[:regular]
).last
update!(bumped_at: post.created_at)

19
spec/models/topic_spec.rb
View File

@ -2315,25 +2315,26 @@ describe Topic do
end
describe "#reset_bumped_at" do
it "ignores hidden and deleted posts when resetting the topic's bump date" do
post = create_post(created_at: 10.hours.ago)
topic = post.topic
it "ignores hidden, deleted, moderator and small action posts when resetting the topic's bump date" do
post1 = create_post(created_at: 10.hours.ago)
topic = post1.topic
expect { topic.reset_bumped_at }.to_not change { topic.bumped_at }
post = Fabricate(:post, topic: topic, post_number: 2, created_at: 9.hours.ago)
post2 = Fabricate(:post, topic: topic, post_number: 2, created_at: 9.hours.ago)
Fabricate(:post, topic: topic, post_number: 3, created_at: 8.hours.ago, deleted_at: 1.hour.ago)
Fabricate(:post, topic: topic, post_number: 4, created_at: 7.hours.ago, hidden: true)
Fabricate(:post, topic: topic, post_number: 5, created_at: 6.hours.ago, user_deleted: true)
Fabricate(:post, topic: topic, post_number: 6, created_at: 5.hours.ago, post_type: Post.types[:whisper])
expect { topic.reset_bumped_at }.to change { topic.bumped_at }.to(post.reload.created_at)
expect { topic.reset_bumped_at }.to change { topic.bumped_at }.to(post2.reload.created_at)
post = Fabricate(:post, topic: topic, post_number: 7, created_at: 4.hours.ago, post_type: Post.types[:moderator_action])
expect { topic.reset_bumped_at }.to change { topic.bumped_at }.to(post.reload.created_at)
post3 = Fabricate(:post, topic: topic, post_number: 7, created_at: 4.hours.ago, post_type: Post.types[:regular])
expect { topic.reset_bumped_at }.to change { topic.bumped_at }.to(post3.reload.created_at)
post = Fabricate(:post, topic: topic, post_number: 8, created_at: 3.hours.ago, post_type: Post.types[:small_action])
expect { topic.reset_bumped_at }.to change { topic.bumped_at }.to(post.reload.created_at)
Fabricate(:post, topic: topic, post_number: 8, created_at: 3.hours.ago, post_type: Post.types[:small_action])
Fabricate(:post, topic: topic, post_number: 9, created_at: 2.hours.ago, post_type: Post.types[:moderator_action])
expect { topic.reset_bumped_at }.not_to change { topic.bumped_at }
end
end
end