diff --git a/app/logical/danbooru_maintenance.rb b/app/logical/danbooru_maintenance.rb index e12a12f51..c969b040b 100644 --- a/app/logical/danbooru_maintenance.rb +++ b/app/logical/danbooru_maintenance.rb @@ -6,7 +6,7 @@ module DanbooruMaintenance end def daily - safely { PostPruner.new.prune! } + safely { PostPruner.prune! } safely { Delayed::Job.where('created_at < ?', 45.days.ago).delete_all } safely { PostDisapproval.prune! } safely { regenerate_post_counts! } diff --git a/test/unit/danbooru_maintenance_test.rb b/test/unit/danbooru_maintenance_test.rb index c39b756cd..e95a08327 100644 --- a/test/unit/danbooru_maintenance_test.rb +++ b/test/unit/danbooru_maintenance_test.rb @@ -7,13 +7,20 @@ class DanbooruMaintenanceTest < ActiveSupport::TestCase end should "prune expired posts" do - @pending = FactoryBot.create(:post, is_pending: true, created_at: 4.days.ago) - @flagged = FactoryBot.create(:post, is_flagged: true, created_at: 4.days.ago) + @pending = create(:post, is_pending: true, created_at: 5.days.ago) + @flagged = create(:post, is_flagged: true, created_at: 5.days.ago) + @appealed = create(:post, is_deleted: true, created_at: 5.days.ago) + + @flag = create(:post_flag, post: @flagged, created_at: 4.days.ago) + @appeal = create(:post_appeal, post: @appealed, created_at: 4.days.ago) DanbooruMaintenance.daily - assert(true, @pending.reload.is_deleted) - assert(true, @flagged.reload.is_deleted) + assert_equal(true, @pending.reload.is_deleted?) + assert_equal(true, @flagged.reload.is_deleted?) + assert_equal(true, @appealed.reload.is_deleted?) + assert_equal(true, @flag.reload.succeeded?) + assert_equal(true, @appeal.reload.rejected?) end context "when pruning bans" do