github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-12 03:21:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: ensure consistency should handle cases where a topic trashed

Browse Source 
Followup to c05b6170
This commit is contained in:
Sam Saffron 2019-06-07 14:56:31 +10:00
parent ee142c2173
commit ff3a1eae3a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/category.rb
View File

@ -679,7 +679,7 @@ class Category < ActiveRecord::Base
SQL SQL
DB.query_single(sql).each do |id| DB.query_single(sql).each do |id|
Topic.find(id).destroy! Topic.with_deleted.find_by(id: id).destroy!
end end
sql = <<~SQL sql = <<~SQL

3
spec/models/category_spec.rb
View File

@ -898,6 +898,9 @@ describe Category do
uncategorized.create_category_definition uncategorized.create_category_definition
uncategorized.topic.posts.first.destroy! uncategorized.topic.posts.first.destroy!
# make stuff extra broken
uncategorized.topic.trash!
category = Fabricate(:category) category = Fabricate(:category)
category_destroyed = Fabricate(:category) category_destroyed = Fabricate(:category)
category_trashed = Fabricate(:category) category_trashed = Fabricate(:category)