From 6d77156a940a1068e9175ebb2c238405346bc3b9 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Thu, 25 Apr 2019 11:59:31 +0200 Subject: [PATCH] FIX: Don't try to delete inactive admins --- app/jobs/scheduled/clean_up_inactive_users.rb | 2 +- spec/jobs/clean_up_inactive_users_spec.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/jobs/scheduled/clean_up_inactive_users.rb b/app/jobs/scheduled/clean_up_inactive_users.rb index 8bebeb21ea6..25d3f3bfa59 100644 --- a/app/jobs/scheduled/clean_up_inactive_users.rb +++ b/app/jobs/scheduled/clean_up_inactive_users.rb @@ -9,7 +9,7 @@ module Jobs destroyer = UserDestroyer.new(Discourse.system_user) User.joins("LEFT JOIN posts ON posts.user_id = users.id") - .where(last_posted_at: nil, trust_level: TrustLevel.levels[:newuser]) + .where(last_posted_at: nil, trust_level: TrustLevel.levels[:newuser], admin: false) .where( "posts.user_id IS NULL AND users.last_seen_at < ?", SiteSetting.clean_up_inactive_users_after_days.days.ago diff --git a/spec/jobs/clean_up_inactive_users_spec.rb b/spec/jobs/clean_up_inactive_users_spec.rb index 7790f050ae5..d0c357b93d6 100644 --- a/spec/jobs/clean_up_inactive_users_spec.rb +++ b/spec/jobs/clean_up_inactive_users_spec.rb @@ -32,4 +32,12 @@ RSpec.describe Jobs::CleanUpInactiveUsers do expect(User.exists?(id: user.id)).to eq(false) end + + it "doesn't delete inactive admins" do + SiteSetting.clean_up_inactive_users_after_days = 4 + admin = Fabricate(:admin, last_seen_at: 5.days.ago, trust_level: TrustLevel.levels[:newuser]) + + expect { described_class.new.execute({}) }.to_not change { User.count } + expect(User.exists?(admin.id)).to eq(true) + end end