Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-21 03:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Ensure that we only move posts that belong to the original topic.

Browse Source
This commit is contained in:
Guo Xiang Tan 2017-03-06 15:04:10 +08:00
parent b2cfad5f47
commit 8aea3caf00
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/post_mover.rb
View File

@ -157,7 +157,7 @@ class PostMover
def posts
@posts ||= begin
Post.where(id: post_ids).order(:created_at).tap do |posts|
Post.where(topic: @original_topic, id: post_ids).order(:created_at).tap do |posts|
raise Discourse::InvalidParameters.new(:post_ids) if posts.empty?
end
end

23
spec/models/post_mover_spec.rb
View File

@ -24,9 +24,18 @@ describe PostMover do
let(:category) { Fabricate(:category, user: user) }
let!(:topic) { Fabricate(:topic, user: user) }
let!(:p1) { Fabricate(:post, topic: topic, user: user) }
let!(:p2) { Fabricate(:post, topic: topic, user: another_user, raw: "Has a link to [evil trout](http://eviltrout.com) which is a cool site.", reply_to_post_number: p1.post_number)}
let!(:p3) { Fabricate(:post, topic: topic, reply_to_post_number: p1.post_number, user: user)}
let!(:p4) { Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number, user: user)}
let!(:p2) do
Fabricate(:post,
topic: topic,
user: another_user,
raw: "Has a link to [evil trout](http://eviltrout.com) which is a cool site.",
reply_to_post_number: p1.post_number)
end
let!(:p3) { Fabricate(:post, topic: topic, reply_to_post_number: p1.post_number, user: user) }
let!(:p4) { Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number, user: user) }
let!(:p5) { Fabricate(:post) }
before do
p1.replies << p3
@ -191,6 +200,14 @@ describe PostMover do
topic.reload
expect(topic.closed).to eq(true)
end
it 'does not move posts that do not belong to the existing topic' do
new_topic = topic.move_posts(
user, [p2.id, p3.id, p5.id], title: 'Logan is a pretty good movie'
)
expect(new_topic.posts.pluck(:id)).to eq([p2.id, p3.id])
end
end
context "to an existing topic" do