From 477eb0591e55a6d89d6b1928d6ddd8575a3ced73 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 6 Mar 2017 14:55:58 +0800
Subject: [PATCH] FIX: Posts in a deleted topic couldn't be moved.

https://meta.discourse.org/t/moving-posts-to-new-topic/58436/4
---
 app/controllers/topics_controller.rb       |  2 +-
 spec/controllers/topics_controller_spec.rb | 48 ++++++++++++++++++----
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index f5bddc8981a..e3f70dc40b9 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -497,7 +497,7 @@ class TopicsController < ApplicationController
     params.require(:topic_id)
     params.permit(:category_id)
 
-    topic = Topic.find_by(id: params[:topic_id])
+    topic = Topic.with_deleted.find_by(id: params[:topic_id])
     guardian.ensure_can_move_posts!(topic)
 
     dest_topic = move_posts_to_destination(topic)
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index 67342edd042..4a5885ff60d 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -64,7 +64,7 @@ describe TopicsController do
     end
 
     describe 'moving to a new topic' do
-      let!(:user) { log_in(:moderator) }
+      let(:user) { log_in(:moderator) }
       let(:p1) { Fabricate(:post, user: user) }
       let(:topic) { p1.topic }
 
@@ -79,18 +79,49 @@ describe TopicsController do
       end
 
       context 'success' do
-        let(:p2) { Fabricate(:post, user: user) }
-
-        before do
-          Topic.any_instance.expects(:move_posts).with(user, [p2.id], title: 'blah', category_id: 123).returns(topic)
-          xhr :post, :move_posts, topic_id: topic.id, title: 'blah', post_ids: [p2.id], category_id: 123
-        end
+        let(:user) { log_in(:admin) }
+        let(:p2) { Fabricate(:post, user: user, topic: topic) }
 
         it "returns success" do
+          p2
+
+          expect do
+            xhr :post, :move_posts,
+              topic_id: topic.id,
+              title: 'Logan is a good movie',
+              post_ids: [p2.id],
+              category_id: 123
+          end.to change { Topic.count }.by(1)
+
           expect(response).to be_success
+
           result = ::JSON.parse(response.body)
+
           expect(result['success']).to eq(true)
-          expect(result['url']).to be_present
+          expect(result['url']).to eq(Topic.last.relative_url)
+        end
+
+        describe 'when topic has been deleted' do
+          it 'should still be able to move posts' do
+            PostDestroyer.new(user, topic.first_post).destroy
+
+            expect(topic.reload.deleted_at).to_not be_nil
+
+            expect do
+              xhr :post, :move_posts,
+                topic_id: topic.id,
+                title: 'Logan is a good movie',
+                post_ids: [p2.id],
+                category_id: 123
+            end.to change { Topic.count }.by(1)
+
+            expect(response).to be_success
+
+            result = JSON.parse(response.body)
+
+            expect(result['success']).to eq(true)
+            expect(result['url']).to eq(Topic.last.relative_url)
+          end
         end
       end
 
@@ -131,7 +162,6 @@ describe TopicsController do
 
     end
 
-
     describe 'moving to an existing topic' do
       let!(:user) { log_in(:moderator) }
       let(:p1) { Fabricate(:post, user: user) }